diff --git a/java/ql/lib/semmle/code/java/Javadoc.qll b/java/ql/lib/semmle/code/java/Javadoc.qll
index 8f7b1dbf580..044ed17f476 100755
--- a/java/ql/lib/semmle/code/java/Javadoc.qll
+++ b/java/ql/lib/semmle/code/java/Javadoc.qll
@@ -3,7 +3,6 @@
  */
 
 import semmle.code.Location
-import Element
 
 /** A Javadoc parent is an element whose child can be some Javadoc documentation. */
 class JavadocParent extends @javadocParent, Top {
diff --git a/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll b/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll
index 5f1ed3438b5..3fae0f0b4d2 100644
--- a/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll
+++ b/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll
@@ -4,7 +4,6 @@
 
 import java
 import Dominance
-import semmle.code.java.ControlFlowGraph
 
 /**
  * A control-flow node that represents the start of a basic block.
diff --git a/java/ql/lib/semmle/code/java/controlflow/Dominance.qll b/java/ql/lib/semmle/code/java/controlflow/Dominance.qll
index cbc16022d25..a1263ce3f0e 100644
--- a/java/ql/lib/semmle/code/java/controlflow/Dominance.qll
+++ b/java/ql/lib/semmle/code/java/controlflow/Dominance.qll
@@ -3,7 +3,6 @@
  */
 
 import java
-private import semmle.code.java.ControlFlowGraph
 
 /*
  * Predicates for basic-block-level dominance.
diff --git a/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll b/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll
index 4e8f7e8aa22..28cfced918f 100644
--- a/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/ExternalFlow.qll
@@ -138,7 +138,6 @@ private module Frameworks {
   private import semmle.code.java.frameworks.MyBatis
   private import semmle.code.java.frameworks.Hibernate
   private import semmle.code.java.frameworks.jOOQ
-  private import semmle.code.java.frameworks.spring.SpringHttp
 }
 
 private predicate sourceModelCsv(string row) {
diff --git a/java/ql/lib/semmle/code/java/deadcode/DeadEnumConstant.qll b/java/ql/lib/semmle/code/java/deadcode/DeadEnumConstant.qll
index 17c8e09eabb..506da3803f7 100644
--- a/java/ql/lib/semmle/code/java/deadcode/DeadEnumConstant.qll
+++ b/java/ql/lib/semmle/code/java/deadcode/DeadEnumConstant.qll
@@ -1,5 +1,4 @@
 import java
-import semmle.code.java.JDKAnnotations
 
 /**
  * Direct flow of values (i.e. object references) through expressions.
diff --git a/java/ql/lib/semmle/code/java/frameworks/ApacheLdap.qll b/java/ql/lib/semmle/code/java/frameworks/ApacheLdap.qll
index a1cf6376bdf..8bcba2f044e 100644
--- a/java/ql/lib/semmle/code/java/frameworks/ApacheLdap.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/ApacheLdap.qll
@@ -3,8 +3,6 @@
  */
 
 import java
-import semmle.code.java.Type
-import semmle.code.java.Member
 
 /*--- Types ---*/
 /** The interface `org.apache.directory.ldap.client.api.LdapConnection`. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/Jndi.qll b/java/ql/lib/semmle/code/java/frameworks/Jndi.qll
index 9294c0c97c7..b52a280e964 100644
--- a/java/ql/lib/semmle/code/java/frameworks/Jndi.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/Jndi.qll
@@ -3,8 +3,6 @@
  */
 
 import java
-import semmle.code.java.Type
-import semmle.code.java.Member
 
 /*--- Types ---*/
 /** The interface `javax.naming.Context`. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/SpringLdap.qll b/java/ql/lib/semmle/code/java/frameworks/SpringLdap.qll
index 2db8435c22c..da40caf3744 100644
--- a/java/ql/lib/semmle/code/java/frameworks/SpringLdap.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/SpringLdap.qll
@@ -3,8 +3,6 @@
  */
 
 import java
-import semmle.code.java.Type
-import semmle.code.java.Member
 
 /*--- Types ---*/
 /** The class `org.springframework.ldap.core.LdapTemplate`. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/UnboundId.qll b/java/ql/lib/semmle/code/java/frameworks/UnboundId.qll
index 2bac6eb5ce2..dfa7fd6286a 100644
--- a/java/ql/lib/semmle/code/java/frameworks/UnboundId.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/UnboundId.qll
@@ -3,8 +3,6 @@
  */
 
 import java
-import semmle.code.java.Type
-import semmle.code.java.Member
 
 /*--- Types ---*/
 /** The interface `com.unboundid.ldap.sdk.ReadOnlySearchRequest`. */
diff --git a/java/ql/lib/semmle/code/java/frameworks/struts/StrutsXML.qll b/java/ql/lib/semmle/code/java/frameworks/struts/StrutsXML.qll
index 77285d98175..5f628b19a51 100644
--- a/java/ql/lib/semmle/code/java/frameworks/struts/StrutsXML.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/struts/StrutsXML.qll
@@ -1,5 +1,4 @@
 import java
-import semmle.code.xml.XML
 
 /**
  * Holds if any struts XML files are included in this snapshot.
diff --git a/java/ql/src/Advisory/Declarations/NonPrivateField.ql b/java/ql/src/Advisory/Declarations/NonPrivateField.ql
index 60e49003586..30b18ec53fd 100644
--- a/java/ql/src/Advisory/Declarations/NonPrivateField.ql
+++ b/java/ql/src/Advisory/Declarations/NonPrivateField.ql
@@ -10,7 +10,6 @@
  */
 
 import java
-import semmle.code.java.JDKAnnotations
 
 class NonConstantSourceField extends Field {
   NonConstantSourceField() {
diff --git a/java/ql/src/Likely Bugs/Serialization/NonSerializableField.ql b/java/ql/src/Likely Bugs/Serialization/NonSerializableField.ql
index 0b594c0a78f..131a5747f49 100644
--- a/java/ql/src/Likely Bugs/Serialization/NonSerializableField.ql	
+++ b/java/ql/src/Likely Bugs/Serialization/NonSerializableField.ql	
@@ -12,7 +12,6 @@
  */
 
 import java
-import semmle.code.java.JDKAnnotations
 import semmle.code.java.Collections
 import semmle.code.java.Maps
 import semmle.code.java.frameworks.javaee.ejb.EJB
diff --git a/java/ql/src/Likely Bugs/Serialization/NonSerializableInnerClass.ql b/java/ql/src/Likely Bugs/Serialization/NonSerializableInnerClass.ql
index 7d831f9cb3f..1bf54abb89f 100644
--- a/java/ql/src/Likely Bugs/Serialization/NonSerializableInnerClass.ql	
+++ b/java/ql/src/Likely Bugs/Serialization/NonSerializableInnerClass.ql	
@@ -12,7 +12,6 @@
  */
 
 import java
-import semmle.code.java.JDKAnnotations
 
 predicate isSerializable(RefType t) { t.getAnAncestor() instanceof TypeSerializable }