2 files changed, 3 insertions, 2 deletions
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
index c66a3e0..fae600a 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
@@ -145,7 +145,7 @@ public class ImportCollector {
       // exclude a current class or one of the nested ones, java.lang and empty packages
       if (!setNotImportedNames.contains(ent.getKey()) &&
           !JAVA_LANG_PACKAGE.equals(ent.getValue()) &&
-          !ent.getValue().isEmpty()) {
+          !ent.getValue().isEmpty() && !ent.getValue().equals(this.currentPackagePoint)) { // Spigot: Remove same package imports
         res.add(ent.getValue() + "." + ent.getKey());
       }
     }
diff --git a/src/org/jetbrains/java/decompiler/main/collectors/VarNamesCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/VarNamesCollector.java
index dfde971..8d9d5c0 100644
--- a/src/org/jetbrains/java/decompiler/main/collectors/VarNamesCollector.java
+++ b/src/org/jetbrains/java/decompiler/main/collectors/VarNamesCollector.java
@@ -15,6 +15,7 @@
  */
 package org.jetbrains.java.decompiler.main.collectors;
 
+import java.util.Collection;
 import java.util.HashSet;
 
 public class VarNamesCollector {
@@ -24,7 +25,7 @@ public class VarNamesCollector {
   public VarNamesCollector() {
   }
 
-  public VarNamesCollector(HashSet<String> setNames) {
+  public VarNamesCollector(Collection<String> setNames) {
     usedNames.addAll(setNames);
   }