diff --git a/briar-android/build.gradle b/briar-android/build.gradle
index b52c0c52177a6818226ee7be439efe4575698443..e265dc157f6a327ef2cb8dccdb65d72eee607698 100644
--- a/briar-android/build.gradle
+++ b/briar-android/build.gradle
@@ -6,9 +6,7 @@ repositories {
 }
 
 dependencies {
-    compile fileTree(dir: '../briar-api/libs', include: '*.jar')
     compile project(':briar-api')
-    compile fileTree(dir: '../briar-core/libs', include: '*.jar')
     compile project(':briar-core')
     compile fileTree(dir: 'libs', include: '*.jar')
     compile "com.android.support:support-v4:23.1.1"
@@ -16,6 +14,8 @@ dependencies {
     compile "com.android.support:preference-v7:23.1.1"
     compile "com.android.support:preference-v14:23.1.1"
     compile "com.android.support:design:23.1.1"
+    compile "org.roboguice:roboguice:2.0"
+    compile "org.connectbot.jsocks:jsocks:1.0.0"
     compile "info.guardianproject.panic:panic:0.5"
     compile "info.guardianproject.trustedintents:trustedintents:0.2"
 }
@@ -29,6 +29,8 @@ dependencyVerification {
             'com.android.support:design:41a9cd75ca78f25df5f573db7cedf8bb66beae00c330943923ba9f3e2051736d',
             'com.android.support:support-annotations:f347a35b9748a4103b39a6714a77e2100f488d623fd6268e259c177b200e9d82',
             'com.android.support:recyclerview-v7:7606373da0931a1e62588335465a0e390cd676c98117edab29220317495faefd',
+            'org.roboguice:roboguice:c5302f2648170ee6015a0d18fe0fcc87e09e415a34aeae3566e8d1a9dbb53f28',
+            'org.connectbot.jsocks:jsocks:4ae46cd23dfd2496e90a9cde5cd32884ec8b3871a8815dbf425dca224cbc2589',
             'info.guardianproject.panic:panic:a7ed9439826db2e9901649892cf9afbe76f00991b768d8f4c26332d7c9406cb2',
             'info.guardianproject.trustedintents:trustedintents:6221456d8821a8d974c2acf86306900237cf6afaaa94a4c9c44e161350f80f3e',
     ]
diff --git a/briar-android/libs/jsocks.jar b/briar-android/libs/jsocks.jar
deleted file mode 100644
index 4bf80e6f8aac3af4da716d259a612f4d9159de1d..0000000000000000000000000000000000000000
Binary files a/briar-android/libs/jsocks.jar and /dev/null differ
diff --git a/briar-android/libs/roboguice-2.0.jar b/briar-android/libs/roboguice-2.0.jar
deleted file mode 100644
index bdb7d08b8d7db70b7a1cea4327ff9abe1902741d..0000000000000000000000000000000000000000
Binary files a/briar-android/libs/roboguice-2.0.jar and /dev/null differ
diff --git a/briar-android/src/org/briarproject/plugins/tor/TorPlugin.java b/briar-android/src/org/briarproject/plugins/tor/TorPlugin.java
index ebcf4c779e467a4285e5b6cda562ea51c6b2fc24..fc2a6d190bd68e58fa860acdd5391c91685d2b7f 100644
--- a/briar-android/src/org/briarproject/plugins/tor/TorPlugin.java
+++ b/briar-android/src/org/briarproject/plugins/tor/TorPlugin.java
@@ -46,8 +46,8 @@ import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import java.util.zip.ZipInputStream;
 
-import socks.Socks5Proxy;
-import socks.SocksSocket;
+import net.sourceforge.jsocks.Socks5Proxy;
+import net.sourceforge.jsocks.SocksSocket;
 
 import static android.content.Context.CONNECTIVITY_SERVICE;
 import static android.content.Context.MODE_PRIVATE;
diff --git a/briar-api/build.gradle b/briar-api/build.gradle
index e273f64dd730e67a8e371ae454bb7d944bfa64be..4e5787800e789e0197be21e895e3b690a7477a93 100644
--- a/briar-api/build.gradle
+++ b/briar-api/build.gradle
@@ -2,8 +2,25 @@ apply plugin: 'java'
 sourceCompatibility = 1.6
 targetCompatibility = 1.6
 
+apply plugin: 'witness'
+
+repositories {
+    jcenter()
+}
+
 dependencies {
-    compile fileTree(dir: 'libs', include: '*.jar')
+    compile "javax.inject:javax.inject:1"
+    compile "com.google.inject:guice:3.0:no_aop"
+}
+
+dependencyVerification {
+    verify = [
+            'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff',
+            'com.google.inject:guice:7c0624d0986ae2bd7a8f1cf4789bcaae5b82a042a7e3d27ba3041ed7b7f2cd3a',
+            'aopalliance:aopalliance:0addec670fedcd3f113c5c8091d783280d23f75e3acb841b61a9cdb079376a08',
+            'org.sonatype.sisu.inject:cglib:42e1dfb26becbf1a633f25b47e39fcc422b85e77e4c0468d9a44f885f5fa0be2',
+            'asm:asm:333ff5369043975b7e031b8b27206937441854738e038c1f47f98d072a20437a',
+    ]
 }
 
 sourceSets {
diff --git a/briar-api/libs/guice-3.0-no_aop.jar b/briar-api/libs/guice-3.0-no_aop.jar
deleted file mode 100644
index ef3a55b0c58bbb397e7e9b354b2975a79f22306a..0000000000000000000000000000000000000000
Binary files a/briar-api/libs/guice-3.0-no_aop.jar and /dev/null differ
diff --git a/briar-api/libs/javax.inject.jar b/briar-api/libs/javax.inject.jar
deleted file mode 100644
index 1ff61ceecf0d3c8c7f6bc4f0c4455f9df05e71c2..0000000000000000000000000000000000000000
Binary files a/briar-api/libs/javax.inject.jar and /dev/null differ
diff --git a/briar-core/build.gradle b/briar-core/build.gradle
index 0a453adab3e499e094f2cb96c994e925de074936..67c2f28d1a3dbfb23dfe9662b8132a3a50c63ffc 100644
--- a/briar-core/build.gradle
+++ b/briar-core/build.gradle
@@ -2,10 +2,24 @@ apply plugin: 'java'
 sourceCompatibility = 1.6
 targetCompatibility = 1.6
 
+apply plugin: 'witness'
+
+repositories {
+    jcenter()
+}
+
 dependencies {
-    compile fileTree(dir: '../briar-api/libs', include: '*.jar')
     compile project(':briar-api')
     compile fileTree(dir: 'libs', include: '*.jar')
+    compile "com.madgag.spongycastle:core:1.54.0.0"
+    compile "com.h2database:h2:1.4.190"
+}
+
+dependencyVerification {
+    verify = [
+            'com.madgag.spongycastle:core:1e7fa4b19ccccd1011364ab838d0b4702470c178bbbdd94c5c90b2d4d749ea1e',
+            'com.h2database:h2:23ba495a07bbbb3bd6c3084d10a96dad7a23741b8b6d64b213459a784195a98c',
+    ]
 }
 
 sourceSets {
diff --git a/briar-core/libs/h2small-1.4.190.jar b/briar-core/libs/h2small-1.4.190.jar
deleted file mode 100644
index edf923e45b2547488f6601de99a4c6d8597e5c22..0000000000000000000000000000000000000000
Binary files a/briar-core/libs/h2small-1.4.190.jar and /dev/null differ
diff --git a/briar-core/libs/spongy-core-1.53.jar b/briar-core/libs/spongy-core-1.53.jar
deleted file mode 100644
index 5322c3625838725c4a10ef1c9284b08b75ff8ebd..0000000000000000000000000000000000000000
Binary files a/briar-core/libs/spongy-core-1.53.jar and /dev/null differ
diff --git a/briar-desktop/build.gradle b/briar-desktop/build.gradle
index 6331560ba6d62e5ef63026a500c79b154b91f7ae..27528796df554ad152eab55ed91fa3f5c72f7759 100644
--- a/briar-desktop/build.gradle
+++ b/briar-desktop/build.gradle
@@ -2,8 +2,13 @@ apply plugin: 'java'
 sourceCompatibility = 1.6
 targetCompatibility = 1.6
 
+apply plugin: 'witness'
+
+repositories {
+    jcenter()
+}
+
 dependencies {
-    compile fileTree(dir: '../briar-api/libs', include: '*.jar')
     compile project(':briar-api')
     compile fileTree(dir: '../briar-core/libs', include: '*.jar')
     compile project(':briar-core')
diff --git a/briar-tests/build.gradle b/briar-tests/build.gradle
index 65a3428f07616cb52b2e6c1cc798a7c7b3b5cf16..eb10dd05df71fadc4d36264a0addf0aca6a9fd39 100644
--- a/briar-tests/build.gradle
+++ b/briar-tests/build.gradle
@@ -2,14 +2,31 @@ apply plugin: 'java'
 sourceCompatibility = 1.6
 targetCompatibility = 1.6
 
+apply plugin: 'witness'
+
+repositories {
+    jcenter()
+}
+
 dependencies {
-    compile fileTree(dir: '../briar-api/libs', include: '*.jar')
     compile project(':briar-api')
-    compile fileTree(dir: '../briar-core/libs', include: '*.jar')
     compile project(':briar-core')
     compile fileTree(dir: '../briar-desktop/libs', include: '*.jar')
     compile project(':briar-desktop')
-    compile fileTree(dir: 'libs', include: '*.jar')
+
+    compile "junit:junit:4.12"
+    compile "org.jmock:jmock:2.8.1"
+    compile "org.hamcrest:hamcrest-library:1.3"
+    compile "org.hamcrest:hamcrest-core:1.3"
+}
+
+dependencyVerification {
+    verify = [
+            'junit:junit:59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a',
+            'org.jmock:jmock:75d4bdaf636879f0215830c5e6ab99407069a625eaffde5d57b32d887b75dc14',
+            'org.hamcrest:hamcrest-library:711d64522f9ec410983bd310934296da134be4254a125080a0416ec178dfad1c',
+            'org.hamcrest:hamcrest-core:66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9',
+    ]
 }
 
 sourceSets {
diff --git a/briar-tests/libs/hamcrest-core-1.1.jar b/briar-tests/libs/hamcrest-core-1.1.jar
deleted file mode 100644
index 5f1d5ce0c3d60472692cda24885c92042a693ac0..0000000000000000000000000000000000000000
Binary files a/briar-tests/libs/hamcrest-core-1.1.jar and /dev/null differ
diff --git a/briar-tests/libs/hamcrest-library-1.1.jar b/briar-tests/libs/hamcrest-library-1.1.jar
deleted file mode 100644
index 40610c9b4a2343cc8891a055dcd301e8d142d937..0000000000000000000000000000000000000000
Binary files a/briar-tests/libs/hamcrest-library-1.1.jar and /dev/null differ
diff --git a/briar-tests/libs/jmock-2.5.1.jar b/briar-tests/libs/jmock-2.5.1.jar
deleted file mode 100644
index 4415dfbc94f8515bef4495976bcdb0fa5e6b5981..0000000000000000000000000000000000000000
Binary files a/briar-tests/libs/jmock-2.5.1.jar and /dev/null differ
diff --git a/briar-tests/libs/junit-4.9b3.jar b/briar-tests/libs/junit-4.9b3.jar
deleted file mode 100644
index 8c784e5810eed4a350abcd9d48afe20b8f20eb2c..0000000000000000000000000000000000000000
Binary files a/briar-tests/libs/junit-4.9b3.jar and /dev/null differ