diff --git a/lapack-netlib/SRC/dgebd2.c b/lapack-netlib/SRC/dgebd2.c
index 2cd70809c..c675e5c72 100644
--- a/lapack-netlib/SRC/dgebd2.c
+++ b/lapack-netlib/SRC/dgebd2.c
@@ -19,7 +19,29 @@
 #undef I
 #endif
 
-typedef int integer;
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+typedef long long BLASLONG;
+typedef unsigned long long BLASULONG;
+#else
+typedef long BLASLONG;
+typedef unsigned long BLASULONG;
+#endif
+
+#ifdef LAPACK_ILP64
+typedef BLASLONG blasint;
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+#define blasabs(x) llabs(x)
+#else
+#define blasabs(x) labs(x)
+#endif
+#else
+typedef int blasint;
+#define blasabs(x) abs(x)
+#endif
+
+typedef blasint integer;
+
+
 typedef unsigned int uinteger;
 typedef char *address;
 typedef short int shortint;
diff --git a/lapack-netlib/SRC/dgebrd.c b/lapack-netlib/SRC/dgebrd.c
index 72a91940c..f964dd73a 100644
--- a/lapack-netlib/SRC/dgebrd.c
+++ b/lapack-netlib/SRC/dgebrd.c
@@ -19,7 +19,29 @@
 #undef I
 #endif
 
-typedef int integer;
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+typedef long long BLASLONG;
+typedef unsigned long long BLASULONG;
+#else
+typedef long BLASLONG;
+typedef unsigned long BLASULONG;
+#endif
+
+#ifdef LAPACK_ILP64
+typedef BLASLONG blasint;
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+#define blasabs(x) llabs(x)
+#else
+#define blasabs(x) labs(x)
+#endif
+#else
+typedef int blasint;
+#define blasabs(x) abs(x)
+#endif
+
+typedef blasint integer;
+
+
 typedef unsigned int uinteger;
 typedef char *address;
 typedef short int shortint;
diff --git a/lapack-netlib/SRC/dgeqrf.c b/lapack-netlib/SRC/dgeqrf.c
index 84ab43763..ff374b4dc 100644
--- a/lapack-netlib/SRC/dgeqrf.c
+++ b/lapack-netlib/SRC/dgeqrf.c
@@ -18,8 +18,28 @@
 #ifdef I
 #undef I
 #endif
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+typedef long long BLASLONG;
+typedef unsigned long long BLASULONG;
+#else
+typedef long BLASLONG;
+typedef unsigned long BLASULONG;
+#endif
+
+#ifdef LAPACK_ILP64
+typedef BLASLONG blasint;
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+#define blasabs(x) llabs(x)
+#else
+#define blasabs(x) labs(x)
+#endif
+#else
+typedef int blasint;
+#define blasabs(x) abs(x)
+#endif
+
+typedef blasint integer;
 
-typedef int integer;
 typedef unsigned int uinteger;
 typedef char *address;
 typedef short int shortint;
diff --git a/lapack-netlib/SRC/dgesvd.c b/lapack-netlib/SRC/dgesvd.c
index f5e1e2568..1041c9d26 100644
--- a/lapack-netlib/SRC/dgesvd.c
+++ b/lapack-netlib/SRC/dgesvd.c
@@ -12,7 +12,6 @@
 #include <string.h>
 #include <stdio.h>
 #include <complex.h>
-#include "../../common.h"
 #ifdef complex
 #undef complex
 #endif
@@ -20,6 +19,26 @@
 #undef I
 #endif
 
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+typedef long long BLASLONG;
+typedef unsigned long long BLASULONG;
+#else
+typedef long BLASLONG;
+typedef unsigned long BLASULONG;
+#endif
+
+#ifdef LAPACK_ILP64
+typedef BLASLONG blasint;
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+#define blasabs(x) llabs(x)
+#else
+#define blasabs(x) labs(x)
+#endif
+#else
+typedef int blasint;
+#define blasabs(x) abs(x)
+#endif
+
 typedef blasint integer;
 typedef unsigned int uinteger;
 typedef char *address;
diff --git a/lapack-netlib/SRC/dlarf.c b/lapack-netlib/SRC/dlarf.c
index 5079db4f0..fd1c424f9 100644
--- a/lapack-netlib/SRC/dlarf.c
+++ b/lapack-netlib/SRC/dlarf.c
@@ -19,7 +19,28 @@
 #undef I
 #endif
 
-typedef int integer;
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+typedef long long BLASLONG;
+typedef unsigned long long BLASULONG;
+#else
+typedef long BLASLONG;
+typedef unsigned long BLASULONG;
+#endif
+
+#ifdef LAPACK_ILP64
+typedef BLASLONG blasint;
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+#define blasabs(x) llabs(x)
+#else
+#define blasabs(x) labs(x)
+#endif
+#else
+typedef int blasint;
+#define blasabs(x) abs(x)
+#endif
+
+typedef blasint integer;
+
 typedef unsigned int uinteger;
 typedef char *address;
 typedef short int shortint;
diff --git a/lapack-netlib/SRC/dlarfg.c b/lapack-netlib/SRC/dlarfg.c
index 9eac14188..50ab178cd 100644
--- a/lapack-netlib/SRC/dlarfg.c
+++ b/lapack-netlib/SRC/dlarfg.c
@@ -18,8 +18,29 @@
 #ifdef I
 #undef I
 #endif
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+typedef long long BLASLONG;
+typedef unsigned long long BLASULONG;
+#else
+typedef long BLASLONG;
+typedef unsigned long BLASULONG;
+#endif
+
+#ifdef LAPACK_ILP64
+typedef BLASLONG blasint;
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+#define blasabs(x) llabs(x)
+#else
+#define blasabs(x) labs(x)
+#endif
+#else
+typedef int blasint;
+#define blasabs(x) abs(x)
+#endif
+
+typedef blasint integer;
+
 
-typedef int integer;
 typedef unsigned int uinteger;
 typedef char *address;
 typedef short int shortint;
diff --git a/lapack-netlib/SRC/dlarft.c b/lapack-netlib/SRC/dlarft.c
index d991ecd40..55b52993f 100644
--- a/lapack-netlib/SRC/dlarft.c
+++ b/lapack-netlib/SRC/dlarft.c
@@ -18,8 +18,28 @@
 #ifdef I
 #undef I
 #endif
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+typedef long long BLASLONG;
+typedef unsigned long long BLASULONG;
+#else
+typedef long BLASLONG;
+typedef unsigned long BLASULONG;
+#endif
+
+#ifdef LAPACK_ILP64
+typedef BLASLONG blasint;
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+#define blasabs(x) llabs(x)
+#else
+#define blasabs(x) labs(x)
+#endif
+#else
+typedef int blasint;
+#define blasabs(x) abs(x)
+#endif
+
+typedef blasint integer;
 
-typedef int integer;
 typedef unsigned int uinteger;
 typedef char *address;
 typedef short int shortint;
diff --git a/lapack-netlib/SRC/dorg2r.c b/lapack-netlib/SRC/dorg2r.c
index 5aeb7d1fe..232904622 100644
--- a/lapack-netlib/SRC/dorg2r.c
+++ b/lapack-netlib/SRC/dorg2r.c
@@ -18,8 +18,28 @@
 #ifdef I
 #undef I
 #endif
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+typedef long long BLASLONG;
+typedef unsigned long long BLASULONG;
+#else
+typedef long BLASLONG;
+typedef unsigned long BLASULONG;
+#endif
+
+#ifdef LAPACK_ILP64
+typedef BLASLONG blasint;
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+#define blasabs(x) llabs(x)
+#else
+#define blasabs(x) labs(x)
+#endif
+#else
+typedef int blasint;
+#define blasabs(x) abs(x)
+#endif
+
+typedef blasint integer;
 
-typedef int integer;
 typedef unsigned int uinteger;
 typedef char *address;
 typedef short int shortint;
diff --git a/lapack-netlib/SRC/dorgbr.c b/lapack-netlib/SRC/dorgbr.c
index dd14b2026..e2e8cb1c1 100644
--- a/lapack-netlib/SRC/dorgbr.c
+++ b/lapack-netlib/SRC/dorgbr.c
@@ -18,8 +18,28 @@
 #ifdef I
 #undef I
 #endif
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+typedef long long BLASLONG;
+typedef unsigned long long BLASULONG;
+#else
+typedef long BLASLONG;
+typedef unsigned long BLASULONG;
+#endif
+
+#ifdef LAPACK_ILP64
+typedef BLASLONG blasint;
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+#define blasabs(x) llabs(x)
+#else
+#define blasabs(x) labs(x)
+#endif
+#else
+typedef int blasint;
+#define blasabs(x) abs(x)
+#endif
+
+typedef blasint integer;
 
-typedef int integer;
 typedef unsigned int uinteger;
 typedef char *address;
 typedef short int shortint;
diff --git a/lapack-netlib/SRC/dorgl2.c b/lapack-netlib/SRC/dorgl2.c
index 46de9e8cc..79e21e7e6 100644
--- a/lapack-netlib/SRC/dorgl2.c
+++ b/lapack-netlib/SRC/dorgl2.c
@@ -18,8 +18,28 @@
 #ifdef I
 #undef I
 #endif
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+typedef long long BLASLONG;
+typedef unsigned long long BLASULONG;
+#else
+typedef long BLASLONG;
+typedef unsigned long BLASULONG;
+#endif
+
+#ifdef LAPACK_ILP64
+typedef BLASLONG blasint;
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+#define blasabs(x) llabs(x)
+#else
+#define blasabs(x) labs(x)
+#endif
+#else
+typedef int blasint;
+#define blasabs(x) abs(x)
+#endif
+
+typedef blasint integer;
 
-typedef int integer;
 typedef unsigned int uinteger;
 typedef char *address;
 typedef short int shortint;
diff --git a/lapack-netlib/SRC/dorglq.c b/lapack-netlib/SRC/dorglq.c
index 11e07773b..fb7128aee 100644
--- a/lapack-netlib/SRC/dorglq.c
+++ b/lapack-netlib/SRC/dorglq.c
@@ -18,8 +18,28 @@
 #ifdef I
 #undef I
 #endif
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+typedef long long BLASLONG;
+typedef unsigned long long BLASULONG;
+#else
+typedef long BLASLONG;
+typedef unsigned long BLASULONG;
+#endif
+
+#ifdef LAPACK_ILP64
+typedef BLASLONG blasint;
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+#define blasabs(x) llabs(x)
+#else
+#define blasabs(x) labs(x)
+#endif
+#else
+typedef int blasint;
+#define blasabs(x) abs(x)
+#endif
+
+typedef blasint integer;
 
-typedef int integer;
 typedef unsigned int uinteger;
 typedef char *address;
 typedef short int shortint;
diff --git a/lapack-netlib/SRC/dorgqr.c b/lapack-netlib/SRC/dorgqr.c
index 53f072d1c..51548b176 100644
--- a/lapack-netlib/SRC/dorgqr.c
+++ b/lapack-netlib/SRC/dorgqr.c
@@ -18,8 +18,28 @@
 #ifdef I
 #undef I
 #endif
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+typedef long long BLASLONG;
+typedef unsigned long long BLASULONG;
+#else
+typedef long BLASLONG;
+typedef unsigned long BLASULONG;
+#endif
+
+#ifdef LAPACK_ILP64
+typedef BLASLONG blasint;
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+#define blasabs(x) llabs(x)
+#else
+#define blasabs(x) labs(x)
+#endif
+#else
+typedef int blasint;
+#define blasabs(x) abs(x)
+#endif
+
+typedef blasint integer;
 
-typedef int integer;
 typedef unsigned int uinteger;
 typedef char *address;
 typedef short int shortint;
diff --git a/lapack-netlib/SRC/dorm2r.c b/lapack-netlib/SRC/dorm2r.c
index 5450b2bcf..c27a6b196 100644
--- a/lapack-netlib/SRC/dorm2r.c
+++ b/lapack-netlib/SRC/dorm2r.c
@@ -18,8 +18,28 @@
 #ifdef I
 #undef I
 #endif
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+typedef long long BLASLONG;
+typedef unsigned long long BLASULONG;
+#else
+typedef long BLASLONG;
+typedef unsigned long BLASULONG;
+#endif
+
+#ifdef LAPACK_ILP64
+typedef BLASLONG blasint;
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+#define blasabs(x) llabs(x)
+#else
+#define blasabs(x) labs(x)
+#endif
+#else
+typedef int blasint;
+#define blasabs(x) abs(x)
+#endif
+
+typedef blasint integer;
 
-typedef int integer;
 typedef unsigned int uinteger;
 typedef char *address;
 typedef short int shortint;
diff --git a/lapack-netlib/SRC/dormbr.c b/lapack-netlib/SRC/dormbr.c
index efb4f0c22..fbb457c54 100644
--- a/lapack-netlib/SRC/dormbr.c
+++ b/lapack-netlib/SRC/dormbr.c
@@ -18,8 +18,28 @@
 #ifdef I
 #undef I
 #endif
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+typedef long long BLASLONG;
+typedef unsigned long long BLASULONG;
+#else
+typedef long BLASLONG;
+typedef unsigned long BLASULONG;
+#endif
+
+#ifdef LAPACK_ILP64
+typedef BLASLONG blasint;
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+#define blasabs(x) llabs(x)
+#else
+#define blasabs(x) labs(x)
+#endif
+#else
+typedef int blasint;
+#define blasabs(x) abs(x)
+#endif
+
+typedef blasint integer;
 
-typedef int integer;
 typedef unsigned int uinteger;
 typedef char *address;
 typedef short int shortint;
diff --git a/lapack-netlib/SRC/dorml2.c b/lapack-netlib/SRC/dorml2.c
index 026d523a4..4fd0d53a2 100644
--- a/lapack-netlib/SRC/dorml2.c
+++ b/lapack-netlib/SRC/dorml2.c
@@ -18,8 +18,28 @@
 #ifdef I
 #undef I
 #endif
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+typedef long long BLASLONG;
+typedef unsigned long long BLASULONG;
+#else
+typedef long BLASLONG;
+typedef unsigned long BLASULONG;
+#endif
+
+#ifdef LAPACK_ILP64
+typedef BLASLONG blasint;
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+#define blasabs(x) llabs(x)
+#else
+#define blasabs(x) labs(x)
+#endif
+#else
+typedef int blasint;
+#define blasabs(x) abs(x)
+#endif
+
+typedef blasint integer;
 
-typedef int integer;
 typedef unsigned int uinteger;
 typedef char *address;
 typedef short int shortint;
diff --git a/lapack-netlib/SRC/dormlq.c b/lapack-netlib/SRC/dormlq.c
index 3c907c766..95c21fcc0 100644
--- a/lapack-netlib/SRC/dormlq.c
+++ b/lapack-netlib/SRC/dormlq.c
@@ -18,8 +18,28 @@
 #ifdef I
 #undef I
 #endif
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+typedef long long BLASLONG;
+typedef unsigned long long BLASULONG;
+#else
+typedef long BLASLONG;
+typedef unsigned long BLASULONG;
+#endif
+
+#ifdef LAPACK_ILP64
+typedef BLASLONG blasint;
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+#define blasabs(x) llabs(x)
+#else
+#define blasabs(x) labs(x)
+#endif
+#else
+typedef int blasint;
+#define blasabs(x) abs(x)
+#endif
+
+typedef blasint integer;
 
-typedef int integer;
 typedef unsigned int uinteger;
 typedef char *address;
 typedef short int shortint;
diff --git a/lapack-netlib/SRC/dormqr.c b/lapack-netlib/SRC/dormqr.c
index 19bf62bff..53d5ea585 100644
--- a/lapack-netlib/SRC/dormqr.c
+++ b/lapack-netlib/SRC/dormqr.c
@@ -18,8 +18,28 @@
 #ifdef I
 #undef I
 #endif
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+typedef long long BLASLONG;
+typedef unsigned long long BLASULONG;
+#else
+typedef long BLASLONG;
+typedef unsigned long BLASULONG;
+#endif
+
+#ifdef LAPACK_ILP64
+typedef BLASLONG blasint;
+#if defined(OS_WINDOWS) && defined(__64BIT__)
+#define blasabs(x) llabs(x)
+#else
+#define blasabs(x) labs(x)
+#endif
+#else
+typedef int blasint;
+#define blasabs(x) abs(x)
+#endif
+
+typedef blasint integer;
 
-typedef int integer;
 typedef unsigned int uinteger;
 typedef char *address;
 typedef short int shortint;