diff --git a/components/net/sf/briar/crypto/KeyParserImpl.java b/components/net/sf/briar/crypto/KeyParserImpl.java
index d5b52e0b0a07192a96206d734037bb8f0d633b8e..13ae3ee5f97ca0d52b4c9ed0a3cab19ee47eff9b 100644
--- a/components/net/sf/briar/crypto/KeyParserImpl.java
+++ b/components/net/sf/briar/crypto/KeyParserImpl.java
@@ -9,7 +9,7 @@ import java.security.spec.X509EncodedKeySpec;
 
 import net.sf.briar.api.crypto.KeyParser;
 
-public class KeyParserImpl implements KeyParser {
+class KeyParserImpl implements KeyParser {
 
 	private final KeyFactory keyFactory;
 
diff --git a/components/net/sf/briar/protocol/AckImpl.java b/components/net/sf/briar/protocol/AckImpl.java
index 939f83bdd2c25db80c3e682ecf48ee3bacced58f..06e34b25b889f395175b621805b7cc78835b8d4e 100644
--- a/components/net/sf/briar/protocol/AckImpl.java
+++ b/components/net/sf/briar/protocol/AckImpl.java
@@ -5,7 +5,7 @@ import java.util.Collection;
 import net.sf.briar.api.protocol.Ack;
 import net.sf.briar.api.protocol.BatchId;
 
-public class AckImpl implements Ack {
+class AckImpl implements Ack {
 
 	private final Collection<BatchId> batches;
 
diff --git a/components/net/sf/briar/protocol/AckReader.java b/components/net/sf/briar/protocol/AckReader.java
index b584082a4d5b89d29702475db37b9f6acac2e661..270b29f508d784401432fbddacd86f0c4940017c 100644
--- a/components/net/sf/briar/protocol/AckReader.java
+++ b/components/net/sf/briar/protocol/AckReader.java
@@ -9,7 +9,7 @@ import net.sf.briar.api.protocol.Tags;
 import net.sf.briar.api.serial.ObjectReader;
 import net.sf.briar.api.serial.Reader;
 
-public class AckReader implements ObjectReader<Ack> {
+class AckReader implements ObjectReader<Ack> {
 
 	private final AckFactory ackFactory;
 
diff --git a/components/net/sf/briar/protocol/BatchIdReader.java b/components/net/sf/briar/protocol/BatchIdReader.java
index c084dede86c05d3bdac5b1f04346da1f4cefb288..57348423348fbffdea232be7d475f16a20c3258c 100644
--- a/components/net/sf/briar/protocol/BatchIdReader.java
+++ b/components/net/sf/briar/protocol/BatchIdReader.java
@@ -9,7 +9,7 @@ import net.sf.briar.api.serial.FormatException;
 import net.sf.briar.api.serial.ObjectReader;
 import net.sf.briar.api.serial.Reader;
 
-public class BatchIdReader implements ObjectReader<BatchId> {
+class BatchIdReader implements ObjectReader<BatchId> {
 
 	public BatchId readObject(Reader r) throws IOException {
 		r.readUserDefinedTag(Tags.BATCH_ID);
diff --git a/components/net/sf/briar/protocol/BatchReader.java b/components/net/sf/briar/protocol/BatchReader.java
index a9611649f2c28d67322a35f80595e3ea4f122478..3bbc04c79edd9df8b5cd7b21926af6cf7f92b6b1 100644
--- a/components/net/sf/briar/protocol/BatchReader.java
+++ b/components/net/sf/briar/protocol/BatchReader.java
@@ -11,7 +11,7 @@ import net.sf.briar.api.protocol.Tags;
 import net.sf.briar.api.serial.ObjectReader;
 import net.sf.briar.api.serial.Reader;
 
-public class BatchReader implements ObjectReader<Batch> {
+class BatchReader implements ObjectReader<Batch> {
 
 	private final MessageDigest messageDigest;
 	private final ObjectReader<Message> messageReader;
diff --git a/components/net/sf/briar/protocol/GroupIdReader.java b/components/net/sf/briar/protocol/GroupIdReader.java
index 17b58d14162e60da59906d120c36497e4e079225..13d37deb524781afc4551fedd556457cdc56c415 100644
--- a/components/net/sf/briar/protocol/GroupIdReader.java
+++ b/components/net/sf/briar/protocol/GroupIdReader.java
@@ -9,7 +9,7 @@ import net.sf.briar.api.serial.FormatException;
 import net.sf.briar.api.serial.ObjectReader;
 import net.sf.briar.api.serial.Reader;
 
-public class GroupIdReader implements ObjectReader<GroupId> {
+class GroupIdReader implements ObjectReader<GroupId> {
 
 	public GroupId readObject(Reader r) throws IOException {
 		r.readUserDefinedTag(Tags.GROUP_ID);
diff --git a/components/net/sf/briar/protocol/GroupImpl.java b/components/net/sf/briar/protocol/GroupImpl.java
index 73a7c95b9527aa4e60d4908b743b0855d4907c90..3335ab98e9e704193330aef71c96259fe315eb5e 100644
--- a/components/net/sf/briar/protocol/GroupImpl.java
+++ b/components/net/sf/briar/protocol/GroupImpl.java
@@ -5,7 +5,7 @@ import java.security.PublicKey;
 import net.sf.briar.api.protocol.Group;
 import net.sf.briar.api.protocol.GroupId;
 
-public class GroupImpl implements Group {
+class GroupImpl implements Group {
 
 	private final GroupId id;
 	private final String name;
diff --git a/components/net/sf/briar/protocol/writers/WritersModule.java b/components/net/sf/briar/protocol/writers/WritersModule.java
index abb7540ed56dd0098a7762e507ee252477ca483d..a8a51fd9df34cbb4406945d4fe6de18a9e075299 100644
--- a/components/net/sf/briar/protocol/writers/WritersModule.java
+++ b/components/net/sf/briar/protocol/writers/WritersModule.java
@@ -1,6 +1,5 @@
 package net.sf.briar.protocol.writers;
 
-
 import net.sf.briar.api.protocol.writers.PacketWriterFactory;
 
 import com.google.inject.AbstractModule;