diff --git a/briar-android/briar-android.iml b/briar-android/briar-android.iml
index 8237583e3a5e0380cd9b9f8ad8844b6203bf887f..6e88d67ad9820aedd549480ff1dd201cd7003de9 100644
--- a/briar-android/briar-android.iml
+++ b/briar-android/briar-android.iml
@@ -59,18 +59,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
diff --git a/briar-api/briar-api.iml b/briar-api/briar-api.iml
index 58d6d226a13e450da486436f408984712729649d..3d154955e7a70a77e4fb68e7ea73656de97d2456 100644
--- a/briar-api/briar-api.iml
+++ b/briar-api/briar-api.iml
@@ -28,6 +28,5 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="guice-3.0-no_aop" level="project" />
     <orderEntry type="library" exported="" name="javax.inject" level="project" />
-    <orderEntry type="library" exported="" name="briar-api.briar-api" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/briar-api/build.gradle b/briar-api/build.gradle
index 8612e93610ae315e7f818543949582286422b81d..e273f64dd730e67a8e371ae454bb7d944bfa64be 100644
--- a/briar-api/build.gradle
+++ b/briar-api/build.gradle
@@ -1,4 +1,6 @@
 apply plugin: 'java'
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
 
 dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
diff --git a/briar-core/briar-core.iml b/briar-core/briar-core.iml
index 36261ca616a701a944fc8c412bfaf4b86d49dc58..0cd707f81f13ff30110583832e5427826aef2791 100644
--- a/briar-core/briar-core.iml
+++ b/briar-core/briar-core.iml
@@ -32,6 +32,5 @@
     <orderEntry type="library" exported="" name="h2small-1.4.190" level="project" />
     <orderEntry type="library" exported="" name="spongy-core-1.53" level="project" />
     <orderEntry type="library" exported="" name="weupnp-0.1.3-SNAPSHOT-briar" level="project" />
-    <orderEntry type="library" exported="" name="briar-core.briar-core" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/briar-core/build.gradle b/briar-core/build.gradle
index ad7abbba79cccf809b93405e99c3cf905f6a24c9..0a453adab3e499e094f2cb96c994e925de074936 100644
--- a/briar-core/build.gradle
+++ b/briar-core/build.gradle
@@ -1,4 +1,6 @@
 apply plugin: 'java'
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
 
 dependencies {
     compile fileTree(dir: '../briar-api/libs', include: '*.jar')
diff --git a/briar-desktop/build.gradle b/briar-desktop/build.gradle
index 3a21e105376d3cb755c132aceaad56246c862014..6331560ba6d62e5ef63026a500c79b154b91f7ae 100644
--- a/briar-desktop/build.gradle
+++ b/briar-desktop/build.gradle
@@ -1,4 +1,6 @@
 apply plugin: 'java'
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
 
 dependencies {
     compile fileTree(dir: '../briar-api/libs', include: '*.jar')
diff --git a/briar-tests/build.gradle b/briar-tests/build.gradle
index a93c46de41f73cd02e8565622d76bba51acdf492..65a3428f07616cb52b2e6c1cc798a7c7b3b5cf16 100644
--- a/briar-tests/build.gradle
+++ b/briar-tests/build.gradle
@@ -1,4 +1,6 @@
 apply plugin: 'java'
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
 
 dependencies {
     compile fileTree(dir: '../briar-api/libs', include: '*.jar')