diff --git a/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/AnnotationProxyMaker.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/AnnotationProxyMaker.java
index e8ef33725..33c8acd47 100644
--- a/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/AnnotationProxyMaker.java
+++ b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/AnnotationProxyMaker.java
@@ -27,25 +27,35 @@ package openjdk.tools.javac.model;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
-import java.lang.annotation.*;
+import java.lang.annotation.Annotation;
+import java.lang.annotation.AnnotationTypeMismatchException;
 import java.lang.reflect.Array;
 import java.lang.reflect.Method;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
-import sun.reflect.annotation.*;
 
 import jdkx.lang.model.type.MirroredTypeException;
 import jdkx.lang.model.type.MirroredTypesException;
 import jdkx.lang.model.type.TypeMirror;
 
-import openjdk.tools.javac.code.*;
-import openjdk.tools.javac.code.Symbol.*;
+import openjdk.tools.javac.code.Attribute;
+import openjdk.tools.javac.code.Symbol;
+import openjdk.tools.javac.code.Symbol.ClassSymbol;
+import openjdk.tools.javac.code.Symbol.MethodSymbol;
+import openjdk.tools.javac.code.Type;
 import openjdk.tools.javac.code.Type.ArrayType;
-import openjdk.tools.javac.util.*;
+import openjdk.tools.javac.util.List;
+import openjdk.tools.javac.util.ListBuffer;
+import openjdk.tools.javac.util.Name;
+import openjdk.tools.javac.util.Pair;
+import sun.reflect.annotation.AnnotationParser;
+import sun.reflect.annotation.AnnotationType;
+import sun.reflect.annotation.EnumConstantNotPresentExceptionProxy;
+import sun.reflect.annotation.ExceptionProxy;
 
+import static openjdk.tools.javac.code.Kinds.Kind.MTH;
 import static openjdk.tools.javac.code.Scope.LookupKind.NON_RECURSIVE;
-import static openjdk.tools.javac.code.Kinds.Kind.*;
 
 /**
  * A generator of dynamic proxy implementations of