diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/EncodedValue/EncodedValueAdaptor.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/EncodedValue/EncodedValueAdaptor.java
index ee6ff65c..f92f75ad 100644
--- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/EncodedValue/EncodedValueAdaptor.java
+++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/EncodedValue/EncodedValueAdaptor.java
@@ -29,8 +29,8 @@
 package org.jf.baksmali.Adaptors.EncodedValue;
 
 import org.jf.dexlib.EncodedValue.*;
-import org.jf.dexlib.TypeIdItem;
 import org.jf.dexlib.StringIdItem;
+import org.jf.dexlib.TypeIdItem;
 
 public abstract class EncodedValueAdaptor {
     public static EncodedValueAdaptor make(EncodedValue encodedValue) {
diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/EncodedValue/TypeEncodedValueAdaptor.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/EncodedValue/TypeEncodedValueAdaptor.java
index f16b243c..8406b70c 100644
--- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/EncodedValue/TypeEncodedValueAdaptor.java
+++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/EncodedValue/TypeEncodedValueAdaptor.java
@@ -28,9 +28,7 @@
 
 package org.jf.baksmali.Adaptors.EncodedValue;
 
-import org.jf.dexlib.StringIdItem;
 import org.jf.dexlib.TypeIdItem;
-import org.jf.dexlib.util.Utf8Utils;
 
 public class TypeEncodedValueAdaptor extends EncodedValueAdaptor {
     private TypeIdItem typeIdItem;
diff --git a/dexlib/src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java b/dexlib/src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java
index fe2e5447..0babb61e 100644
--- a/dexlib/src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java
+++ b/dexlib/src/main/java/org/jf/dexlib/AnnotationDirectoryItem.java
@@ -28,11 +28,9 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.ItemType;
-
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Collections;
+import java.util.List;
 
 public class AnnotationDirectoryItem extends OffsettedItem<AnnotationDirectoryItem> {
     private final ArrayList<FieldAnnotation> fieldAnnotationList = new ArrayList<FieldAnnotation>();
diff --git a/dexlib/src/main/java/org/jf/dexlib/AnnotationItem.java b/dexlib/src/main/java/org/jf/dexlib/AnnotationItem.java
index eb09eca7..d8930c83 100644
--- a/dexlib/src/main/java/org/jf/dexlib/AnnotationItem.java
+++ b/dexlib/src/main/java/org/jf/dexlib/AnnotationItem.java
@@ -29,7 +29,6 @@
 package org.jf.dexlib;
 
 import org.jf.dexlib.EncodedValue.AnnotationEncodedValueSubField;
-import org.jf.dexlib.ItemType;
 
 public class AnnotationItem extends OffsettedItem<AnnotationItem> {
     private final ByteField visibilityField;
diff --git a/dexlib/src/main/java/org/jf/dexlib/AnnotationSetItem.java b/dexlib/src/main/java/org/jf/dexlib/AnnotationSetItem.java
index 6addf972..1b28fcce 100644
--- a/dexlib/src/main/java/org/jf/dexlib/AnnotationSetItem.java
+++ b/dexlib/src/main/java/org/jf/dexlib/AnnotationSetItem.java
@@ -28,8 +28,6 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.ItemType;
-
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/dexlib/src/main/java/org/jf/dexlib/AnnotationSetRefList.java b/dexlib/src/main/java/org/jf/dexlib/AnnotationSetRefList.java
index 18ef0af9..431ed724 100644
--- a/dexlib/src/main/java/org/jf/dexlib/AnnotationSetRefList.java
+++ b/dexlib/src/main/java/org/jf/dexlib/AnnotationSetRefList.java
@@ -28,8 +28,6 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.ItemType;
-
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/dexlib/src/main/java/org/jf/dexlib/ClassDataItem.java b/dexlib/src/main/java/org/jf/dexlib/ClassDataItem.java
index 1984c3a2..50775465 100644
--- a/dexlib/src/main/java/org/jf/dexlib/ClassDataItem.java
+++ b/dexlib/src/main/java/org/jf/dexlib/ClassDataItem.java
@@ -28,7 +28,6 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.ItemType;
 import org.jf.dexlib.util.*;
 
 import java.util.ArrayList;
diff --git a/dexlib/src/main/java/org/jf/dexlib/ClassDefItem.java b/dexlib/src/main/java/org/jf/dexlib/ClassDefItem.java
index cb5ff19f..5ce76eec 100644
--- a/dexlib/src/main/java/org/jf/dexlib/ClassDefItem.java
+++ b/dexlib/src/main/java/org/jf/dexlib/ClassDefItem.java
@@ -28,13 +28,12 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.ItemType;
 import org.jf.dexlib.EncodedValue.EncodedValue;
 import org.jf.dexlib.EncodedValue.EncodedValueSubField;
 import org.jf.dexlib.util.TypeUtils;
 
-import java.util.HashMap;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 public class ClassDefItem extends IndexedItem<ClassDefItem> {
diff --git a/dexlib/src/main/java/org/jf/dexlib/CodeItem.java b/dexlib/src/main/java/org/jf/dexlib/CodeItem.java
index e23e97c8..f0a7e8fd 100644
--- a/dexlib/src/main/java/org/jf/dexlib/CodeItem.java
+++ b/dexlib/src/main/java/org/jf/dexlib/CodeItem.java
@@ -28,16 +28,14 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.code.Instruction;
-import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.code.InstructionField;
-import org.jf.dexlib.ItemType;
-import org.jf.dexlib.util.Input;
+import org.jf.dexlib.code.Opcode;
 import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.HashMap;
+import java.util.List;
 
 public class CodeItem extends OffsettedItem<CodeItem> {
     private final ArrayList<InstructionField> instructionList;
diff --git a/dexlib/src/main/java/org/jf/dexlib/CompositeField.java b/dexlib/src/main/java/org/jf/dexlib/CompositeField.java
index 8c5e42ca..f3e41857 100644
--- a/dexlib/src/main/java/org/jf/dexlib/CompositeField.java
+++ b/dexlib/src/main/java/org/jf/dexlib/CompositeField.java
@@ -28,8 +28,8 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.util.Input;
 import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
 
 
 public abstract class CompositeField<T extends CompositeField<T>> implements Field<T> {
diff --git a/dexlib/src/main/java/org/jf/dexlib/DebugInfoItem.java b/dexlib/src/main/java/org/jf/dexlib/DebugInfoItem.java
index 1987098e..c9f32334 100644
--- a/dexlib/src/main/java/org/jf/dexlib/DebugInfoItem.java
+++ b/dexlib/src/main/java/org/jf/dexlib/DebugInfoItem.java
@@ -28,12 +28,11 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.ItemType;
+import org.jf.dexlib.debug.DebugInstruction;
 import org.jf.dexlib.debug.DebugInstructionFactory;
 import org.jf.dexlib.debug.EndSequence;
-import org.jf.dexlib.debug.DebugInstruction;
-import org.jf.dexlib.util.Input;
 import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/dexlib/src/main/java/org/jf/dexlib/DexFile.java b/dexlib/src/main/java/org/jf/dexlib/DexFile.java
index 9fbb7261..ba24b4dc 100644
--- a/dexlib/src/main/java/org/jf/dexlib/DexFile.java
+++ b/dexlib/src/main/java/org/jf/dexlib/DexFile.java
@@ -28,14 +28,17 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.util.*;
+import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.ByteArrayInput;
+import org.jf.dexlib.util.FileUtils;
+import org.jf.dexlib.util.Input;
 
-import java.util.HashMap;
-import java.util.zip.Adler32;
 import java.io.File;
+import java.security.DigestException;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.security.DigestException;
+import java.util.HashMap;
+import java.util.zip.Adler32;
 
 public class DexFile
 {
diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedArrayItem.java b/dexlib/src/main/java/org/jf/dexlib/EncodedArrayItem.java
index 37e69705..deee76da 100644
--- a/dexlib/src/main/java/org/jf/dexlib/EncodedArrayItem.java
+++ b/dexlib/src/main/java/org/jf/dexlib/EncodedArrayItem.java
@@ -28,14 +28,12 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.ItemType;
 import org.jf.dexlib.EncodedValue.ArrayEncodedValueSubField;
 import org.jf.dexlib.EncodedValue.EncodedValue;
-import org.jf.dexlib.util.Input;
 import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
 
 import java.util.ArrayList;
-import java.util.List;
 
 public class EncodedArrayItem extends OffsettedItem<EncodedArrayItem> {
     private final ArrayEncodedValueSubField encodedArray;
diff --git a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedValue.java b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedValue.java
index 82a31cc9..be337117 100644
--- a/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedValue.java
+++ b/dexlib/src/main/java/org/jf/dexlib/EncodedValue/EncodedValue.java
@@ -28,9 +28,11 @@
 
 package org.jf.dexlib.EncodedValue;
 
-import org.jf.dexlib.util.Input;
+import org.jf.dexlib.CompositeField;
+import org.jf.dexlib.DexFile;
+import org.jf.dexlib.Field;
 import org.jf.dexlib.util.AnnotatedOutput;
-import org.jf.dexlib.*;
+import org.jf.dexlib.util.Input;
 
 public class EncodedValue extends CompositeField<EncodedValue> {
     private class ValueTypeArgField implements Field<ValueTypeArgField> {
diff --git a/dexlib/src/main/java/org/jf/dexlib/Field.java b/dexlib/src/main/java/org/jf/dexlib/Field.java
index 46e47b1d..8ebc1fd4 100644
--- a/dexlib/src/main/java/org/jf/dexlib/Field.java
+++ b/dexlib/src/main/java/org/jf/dexlib/Field.java
@@ -28,8 +28,8 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.util.Input;
 import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
 
 public interface Field<T extends Field> {
     public void writeTo(AnnotatedOutput out);
diff --git a/dexlib/src/main/java/org/jf/dexlib/FieldListField.java b/dexlib/src/main/java/org/jf/dexlib/FieldListField.java
index 05a37461..c63945f9 100644
--- a/dexlib/src/main/java/org/jf/dexlib/FieldListField.java
+++ b/dexlib/src/main/java/org/jf/dexlib/FieldListField.java
@@ -28,8 +28,8 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.util.Input;
 import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
 
 import java.util.ArrayList;
 
diff --git a/dexlib/src/main/java/org/jf/dexlib/FixedByteArrayField.java b/dexlib/src/main/java/org/jf/dexlib/FixedByteArrayField.java
index f9e66743..08f5a080 100644
--- a/dexlib/src/main/java/org/jf/dexlib/FixedByteArrayField.java
+++ b/dexlib/src/main/java/org/jf/dexlib/FixedByteArrayField.java
@@ -28,9 +28,9 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.util.Input;
-import org.jf.dexlib.util.ByteArray;
 import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.ByteArray;
+import org.jf.dexlib.util.Input;
 
 public class FixedByteArrayField implements Field<FixedByteArrayField> {
     protected byte[] value;
diff --git a/dexlib/src/main/java/org/jf/dexlib/HeaderItem.java b/dexlib/src/main/java/org/jf/dexlib/HeaderItem.java
index fff6581f..35ce4244 100644
--- a/dexlib/src/main/java/org/jf/dexlib/HeaderItem.java
+++ b/dexlib/src/main/java/org/jf/dexlib/HeaderItem.java
@@ -28,7 +28,6 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.ItemType;
 import org.jf.dexlib.util.AnnotatedOutput;
 
 import java.io.UnsupportedEncodingException;
diff --git a/dexlib/src/main/java/org/jf/dexlib/Item.java b/dexlib/src/main/java/org/jf/dexlib/Item.java
index 7af35a56..05f98946 100644
--- a/dexlib/src/main/java/org/jf/dexlib/Item.java
+++ b/dexlib/src/main/java/org/jf/dexlib/Item.java
@@ -28,9 +28,8 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.util.Input;
 import org.jf.dexlib.util.AnnotatedOutput;
-import org.jf.dexlib.ItemType;
+import org.jf.dexlib.util.Input;
 
 public abstract class Item<T extends Item> {
     protected int offset = -1;
diff --git a/dexlib/src/main/java/org/jf/dexlib/ListSizeField.java b/dexlib/src/main/java/org/jf/dexlib/ListSizeField.java
index d18ba0d4..4d1515bd 100644
--- a/dexlib/src/main/java/org/jf/dexlib/ListSizeField.java
+++ b/dexlib/src/main/java/org/jf/dexlib/ListSizeField.java
@@ -28,8 +28,8 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.util.Input;
 import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
 
 import java.util.ArrayList;
 
diff --git a/dexlib/src/main/java/org/jf/dexlib/MapField.java b/dexlib/src/main/java/org/jf/dexlib/MapField.java
index d99e6eaa..c5e45894 100644
--- a/dexlib/src/main/java/org/jf/dexlib/MapField.java
+++ b/dexlib/src/main/java/org/jf/dexlib/MapField.java
@@ -28,8 +28,6 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.ItemType;
-
 public class MapField extends CompositeField<MapField> {
     private final ShortIntegerField sectionTypeField;
     private final ShortIntegerField unusedField;
diff --git a/dexlib/src/main/java/org/jf/dexlib/MapItem.java b/dexlib/src/main/java/org/jf/dexlib/MapItem.java
index ef98f5af..56eced76 100644
--- a/dexlib/src/main/java/org/jf/dexlib/MapItem.java
+++ b/dexlib/src/main/java/org/jf/dexlib/MapItem.java
@@ -28,7 +28,6 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.ItemType;
 import org.jf.dexlib.util.AnnotatedOutput;
 
 import java.util.ArrayList;
diff --git a/dexlib/src/main/java/org/jf/dexlib/NullTerminatedByteArrayField.java b/dexlib/src/main/java/org/jf/dexlib/NullTerminatedByteArrayField.java
index 7f4da90b..a35829a6 100644
--- a/dexlib/src/main/java/org/jf/dexlib/NullTerminatedByteArrayField.java
+++ b/dexlib/src/main/java/org/jf/dexlib/NullTerminatedByteArrayField.java
@@ -28,9 +28,9 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.util.Input;
-import org.jf.dexlib.util.ByteArray;
 import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.ByteArray;
+import org.jf.dexlib.util.Input;
 
 public class NullTerminatedByteArrayField implements Field<NullTerminatedByteArrayField> {
     protected byte[] value;
diff --git a/dexlib/src/main/java/org/jf/dexlib/ProtoIdItem.java b/dexlib/src/main/java/org/jf/dexlib/ProtoIdItem.java
index 8a991a1f..d3d67aaa 100644
--- a/dexlib/src/main/java/org/jf/dexlib/ProtoIdItem.java
+++ b/dexlib/src/main/java/org/jf/dexlib/ProtoIdItem.java
@@ -28,8 +28,6 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.ItemType;
-
 import java.util.ArrayList;
 
 public class ProtoIdItem extends IndexedItem<ProtoIdItem> {
diff --git a/dexlib/src/main/java/org/jf/dexlib/Section.java b/dexlib/src/main/java/org/jf/dexlib/Section.java
index 2a01ce12..45fb050c 100644
--- a/dexlib/src/main/java/org/jf/dexlib/Section.java
+++ b/dexlib/src/main/java/org/jf/dexlib/Section.java
@@ -28,8 +28,8 @@
 
 package org.jf.dexlib;
 
-import org.jf.dexlib.util.Input;
 import org.jf.dexlib.util.AnnotatedOutput;
+import org.jf.dexlib.util.Input;
 
 import java.util.ArrayList;
 import java.util.HashMap;