diff --git a/app/build.gradle b/app/build.gradle
index ef32429f12..a99599c608 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -167,9 +167,6 @@ android {
 
 allprojects {
     repositories {
-        flatDir {
-            dirs 'libs'
-        }
     }
 }
 
diff --git a/gradle/android_dependencies.gradle b/gradle/android_dependencies.gradle
index 08e2a76f30..43601e4ca3 100644
--- a/gradle/android_dependencies.gradle
+++ b/gradle/android_dependencies.gradle
@@ -25,6 +25,12 @@ android {
 //        }
     }
 
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['libs']
+        }
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
         targetCompatibility JavaVersion.VERSION_11
diff --git a/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansAPI.kt b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansAPI.kt
index 69bca72f66..4d93eba5d2 100644
--- a/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansAPI.kt
+++ b/openhumans/src/main/java/info/nightscout/androidaps/plugin/general/openhumans/OpenHumansAPI.kt
@@ -6,7 +6,6 @@ import info.nightscout.androidaps.plugin.general.openhumans.dagger.BaseUrl
 import info.nightscout.androidaps.plugin.general.openhumans.dagger.ClientId
 import info.nightscout.androidaps.plugin.general.openhumans.dagger.ClientSecret
 import info.nightscout.androidaps.plugin.general.openhumans.dagger.RedirectUrl
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.suspendCancellableCoroutine
 import okhttp3.*
 import okio.BufferedSink
diff --git a/wear/build.gradle b/wear/build.gradle
index db12d79c41..1be1486f6a 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -88,9 +88,6 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        flatDir {
-            dirs 'libs'
-        }
     }
 }
 
@@ -110,8 +107,8 @@ dependencies {
     compileOnly "com.google.android.wearable:wearable:${wearableVersion}"
     implementation "com.google.android.support:wearable:${wearableVersion}"
     implementation "com.google.android.gms:play-services-wearable:${playServicesWearable}"
-    implementation(name: 'ustwo-clockwise-debug', ext: 'aar')
-    implementation(name: 'wearpreferenceactivity-0.5.0', ext: 'aar')
+    implementation(files('libs/ustwo-clockwise-debug.aar'))
+    implementation(files('libs/wearpreferenceactivity-0.5.0.aar'))
     implementation('com.github.lecho:hellocharts-library:1.5.8@aar')
 
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.0'