diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e8128f16..5ba73f6e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,10 +46,9 @@ option (ENABLE_AUTODETECT_F77_UNDERSCORING "Enable autodetect F77 Underscore" OF
 option (ENABLE_UPPERCASE_BLAS "Enable invocation of Blas with Flame" OFF)
 option (ENABLE_UPPERCASE_LAPACK "Enable invocation of Lapack with Flame" OFF)
 option (ENABLE_GPU "Enable gpu advantage" OFF)
-
+option (ENABLE_XBLAS "Enable xblas API's" OFF)
 
 set (ENABLE_WINDOWS_BUILD "Enables windows build" ON)
-add_compile_definitions(FLA_ENABLE_WINDOWS_BUILD=1)
 
 if(ENABLE_UPPERCASE)
 add_definitions(-DBLIS1_ENABLE_UPPERCASE_F77)
@@ -58,6 +57,9 @@ elseif(NOT ENABLE_UPPERCASE)
 add_definitions(-DNOCHANGE)
 endif()
 
+if(ENABLE_XBLAS)
+add_definitions(-DFLA_ENABLE_XBLAS)
+endif()
 if (ENABLE_NON_CRITICAL_CODE)
     set (FLA_ENABLE_NON_CRITICAL_CODE TRUE)
 endif ()
@@ -102,7 +104,7 @@ if (ENABLE_BLAS3_FRNTEND_CNTL_TREES)
 endif ()
 
 if (ENABLE_WINDOWS_BUILD)
-	add_compile_definitions(FLA_ENABLE_WINDOWS_BUILD=1)
+	set(FLA_ENABLE_WINDOWS_BUILD TRUE)
 endif ()
 
 if (ENABLE_PORTABLE_TIMER)
diff --git a/src/base/flamec/include/FLA_f2c.h b/src/base/flamec/include/FLA_f2c.h
index 1ae37f572..180f5c80c 100644
--- a/src/base/flamec/include/FLA_f2c.h
+++ b/src/base/flamec/include/FLA_f2c.h
@@ -1746,7 +1746,7 @@ typedef doublereal E_f;	/* real function with -R not specified */
 #define sorgrq_                  SORGRQ 
 #define sorgtr_                  SORGTR 
 #define sorgtsqr_                SORGTSQR 
-#define sorhr_col_               SORHR_OL 
+#define sorhr_col_               SORHR_COL 
 #define sorm22_                  SORM22 
 #define sorm2l_                  SORM2L 
 #define sorm2r_                  SORM2R 
@@ -3888,7 +3888,7 @@ typedef doublereal E_f;	/* real function with -R not specified */
 #define sorgrq_                  sorgrq 
 #define sorgtr_                  sorgtr 
 #define sorgtsqr_                sorgtsqr 
-#define sorhr_col_               sorhr_ol 
+#define sorhr_col_               sorhr_col 
 #define sorm22_                  sorm22 
 #define sorm2l_                  sorm2l 
 #define sorm2r_                  sorm2r 
diff --git a/src/base/flamec/include/FLA_macro_defs.h b/src/base/flamec/include/FLA_macro_defs.h
index e1c1bf449..880434194 100644
--- a/src/base/flamec/include/FLA_macro_defs.h
+++ b/src/base/flamec/include/FLA_macro_defs.h
@@ -32,6 +32,9 @@
 #if !defined FLA_ENABLE_MULTITHREADING && !defined FLA_ENABLE_SUPERMATRIX
 #define ENABLE_THREAD_LOCAL_STORAGE 1
 #define LIBFLAME_IMPORT
+#else
+#define ENABLE_THREAD_LOCAL_STORAGE 0
+#define LIBFLAME_IMPORT
 #endif
 #endif