diff --git a/Data/MySQL/build.gradle b/Data/MySQL/build.gradle
index 327fb01ca..109484e3f 100644
--- a/Data/MySQL/build.gradle
+++ b/Data/MySQL/build.gradle
@@ -4,47 +4,44 @@ model {
 			mysql {
 				binaries.withType(StaticLibraryBinary) {
 					def libName = "foobar"
-					println "StaticLibraryBinary:targetPlatform.name=" + targetPlatform.name
 					if (buildType == buildTypes.debug) {
 						libName = 'libmysqld.lib'
 						if (targetPlatform.name == 'win32') {
 							headers.srcDir "$mysql32Home/include"
-							staticLibraryFile = file("$mysql32Home/lib/$libName")
+							staticLibraryFile = new File("$mysql32Home/lib/$libName")
 						} else
 						if (targetPlatform.name == 'win64') {
 							headers.srcDir "$mysql64Home/include"
-							staticLibraryFile = file("$mysql64Home/lib/$libName")
+							staticLibraryFile = new File("$mysql64Home/lib/$libName")
 						}
 					} else
 					if (buildType == buildTypes.release) {
 						libName = 'libmysql.lib'
 						if (targetPlatform.name == 'win32') {
 							headers.srcDir "$mysql32Home/include"
-							staticLibraryFile = file("$mysql32Home/lib/$libName")
+							staticLibraryFile = new File("$mysql32Home/lib/$libName")
 						} else
 						if (targetPlatform.name == 'win64') {
 							headers.srcDir "$mysql64Home/include"
-							staticLibraryFile = file("$mysql64Home/lib/$libName")
+							staticLibraryFile = new File("$mysql64Home/lib/$libName")
 						}
 					}
 				}
 				binaries.withType(SharedLibraryBinary) {
 					def dllName
 					def linkName
-					println "SharedLibraryBinary:targetPlatform.name=" + targetPlatform.name
-					println ""
 					if (buildType == buildTypes.debug) {
 						dllName = 'libmysqld.dll'
 						linkName = 'libmysqld.lib'
 						if (targetPlatform.name == 'win32') {
 							headers.srcDir "$mysql32Home/include"
-							sharedLibraryFile     = file("$mysql32Home/lib/$dllName")
-							sharedLibraryLinkFile = file("$mysql32Home/lib/$linkName")
+							sharedLibraryFile     = new File("$mysql32Home/lib/$dllName")
+							sharedLibraryLinkFile = new File("$mysql32Home/lib/$linkName")
 						} else
 						if (targetPlatform.name == 'win64') {
 							headers.srcDir "$mysql64Home/include"
-							sharedLibraryFile     = file("$mysql64Home/lib/$dllName")
-							sharedLibraryLinkFile = file("$mysql64Home/lib/$linkName")
+							sharedLibraryFile     = new File("$mysql64Home/lib/$dllName")
+							sharedLibraryLinkFile = new File("$mysql64Home/lib/$linkName")
 						}
 					} else
 					if (buildType == buildTypes.release) {
@@ -52,13 +49,13 @@ model {
 						linkName = 'libmysql.lib'
 						if (targetPlatform.name == 'win32') {
 							headers.srcDir "$mysql32Home/include"
-							sharedLibraryFile     = file("$mysql32Home/lib/$dllName")
-							sharedLibraryLinkFile = file("$mysql32Home/lib/$linkName")
+							sharedLibraryFile     = new File("$mysql32Home/lib/$dllName")
+							sharedLibraryLinkFile = new File("$mysql32Home/lib/$linkName")
 						} else
 						if (targetPlatform.name == 'win64') {
 							headers.srcDir "$mysql64Home/include"
-							sharedLibraryFile     = file("$mysql64Home/lib/$dllName")
-							sharedLibraryLinkFile = file("$mysql64Home/lib/$linkName")
+							sharedLibraryFile     = new File("$mysql64Home/lib/$dllName")
+							sharedLibraryLinkFile = new File("$mysql64Home/lib/$linkName")
 						}
 					}
 				}
diff --git a/Data/SQLite/build.gradle b/Data/SQLite/build.gradle
index 8d433acc4..9271a196a 100644
--- a/Data/SQLite/build.gradle
+++ b/Data/SQLite/build.gradle
@@ -54,6 +54,23 @@ model {
 				cppCompiler.define	"SQLITE_OMIT_TCL_VARIABLE"
 				cppCompiler.define	"SQLITE_OMIT_DEPRECATED"
 			}
+			if (toolchain in Gcc) {
+				cCompiler.define	"SQLITE_THREADSAFE=1"
+				cCompiler.define	"SQLITE_DISABLE_LFS"
+				cCompiler.define	"SQLITE_OMIT_UTF16"
+				cCompiler.define	"SQLITE_OMIT_PROGRESS_CALLBACK"
+				cCompiler.define	"SQLITE_OMIT_COMPLETE"
+				cCompiler.define	"SQLITE_OMIT_TCL_VARIABLE"
+				cCompiler.define	"SQLITE_OMIT_DEPRECATED"
+				
+				cppCompiler.define	"SQLITE_THREADSAFE=1"
+				cCompiler.define	"SQLITE_DISABLE_LFS"
+				cppCompiler.define	"SQLITE_OMIT_UTF16"
+				cppCompiler.define	"SQLITE_OMIT_PROGRESS_CALLBACK"
+				cppCompiler.define	"SQLITE_OMIT_COMPLETE"
+				cppCompiler.define	"SQLITE_OMIT_TCL_VARIABLE"
+				cppCompiler.define	"SQLITE_OMIT_DEPRECATED"
+			}
 		}
 		withType(SharedLibraryBinarySpec) {
 			if (toolChain in VisualCpp) {
diff --git a/gradle.properties b/gradle.properties
index 548dcadd7..79f6f4154 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -43,19 +43,19 @@ OpenCppCoverageHome=C:/Program Files/OpenCppCoverage
 #ReportGeneratorHome=C:/ProgramFiles/ReportGenerator
 ReportGeneratorHome=C:/ProgramFiles/ReportGenerator
 
-openSSLWindowsHome  = new File(rootDir, "openssl/build")
+openSSLWindowsHome  = "openssl/build"
 
 ###############################################################################
 # Linux Customization
 ###############################################################################
-openSSLLinuxLib     = new File('/usr/local/lib')
-openSSLLinuxInc     = new File('/usr/local/include/openssl')
+openSSLLinuxLib     = "/usr/local/lib"
+openSSLLinuxInc     = "/usr/local/include/openssl"
 
 
 ###############################################################################
 # Mac OSX Customization
 ###############################################################################
-openSSLBrewHome     = new File('/usr/local/opt/openssl')
+openSSLBrewHome     = "/usr/local/opt/openssl"
 
 
 ###############################################################################
diff --git a/settings.gradle b/settings.gradle
index 1b82dcb2f..c2ffc7b2c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,7 +15,7 @@ if (os.windows) {
 }
 include ':Data'
 // SQL not ready yet
-//include ':Data:ODBC'
+include ':Data:ODBC'
 //include ':Data:SQLite'
 //include ':Data:MySQL'
 include ':Zip'
@@ -39,10 +39,11 @@ include ':Net:testsuite'
 if (os.windows) {
 	include ':NetSSL_Win:testsuite'
 }
-//include ':Data:testsuite'
-//include ':Data:ODBC:testsuite'
-//include ':Data:SQLite:testsuite'
+include ':Data:testsuite'
+include ':Data:ODBC:testsuite'
+include ':Data:SQLite:testsuite'
 //include ':Data:MySQL:testsuite'
+//include ':Data:SQLite:testsuite'
 include ':MongoDB:testsuite'
 include ':Redis:testsuite'
 include ':CppParser:testsuite'
@@ -50,7 +51,7 @@ include ':Zip:testsuite'
 
 include ':Encodings:samples'
 include ':Foundation:samples'
-//include ':Data:samples'
+include ':Data:samples'
 //include ':NetSSL_OpenSSL:samples'
 if (os.windows) {
 	include ':NetSSL_Win:samples'