Merge pull request #8796 from erik-krogh/redundantImport

Remove redundant imports
2026-05-05 05:35:13 +02:00 · 2022-04-27 12:39:51 +02:00
parent 9d774463f5 7dba2b5868
commit e1c7d369be
114 changed files with 87 additions and 120 deletions
--- a/cpp/ql/lib/semmle/code/cpp/Field.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Field.qll
@@ -4,7 +4,6 @@

 import semmle.code.cpp.Variable
 import semmle.code.cpp.Enum
-import semmle.code.cpp.exprs.Access

 /**
 * A C structure member or C++ non-static member variable. For example the
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll
@@ -11,7 +11,6 @@ private import TranslatedDeclarationEntry
 private import TranslatedElement
 private import TranslatedFunction
 private import TranslatedInitialization
-private import TranslatedFunction
 private import TranslatedStmt
 private import TranslatedGlobalVar
 import TranslatedCall
--- a/cpp/ql/lib/semmle/code/cpp/models/implementations/Strtok.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/implementations/Strtok.qll
@@ -5,7 +5,6 @@

 import semmle.code.cpp.Function
 import semmle.code.cpp.models.interfaces.ArrayFunction
-import semmle.code.cpp.models.interfaces.ArrayFunction
 import semmle.code.cpp.models.interfaces.Alias
 import semmle.code.cpp.models.interfaces.SideEffect
 import semmle.code.cpp.models.interfaces.Taint
--- a/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll
+++ b/cpp/ql/lib/semmle/code/cpp/rangeanalysis/SimpleRangeAnalysis.qll
@@ -1802,5 +1802,3 @@ module SimpleRangeAnalysisInternal {
    defMightOverflowNegatively(def, v) and result = varMaxVal(v)
  }
 }
-
-private import SimpleRangeAnalysisInternal
--- a/cpp/ql/lib/semmle/code/cpp/security/BufferWrite.qll
+++ b/cpp/ql/lib/semmle/code/cpp/security/BufferWrite.qll
@@ -6,7 +6,6 @@
 */

 import cpp
-import semmle.code.cpp.commons.Alloc
 import semmle.code.cpp.commons.Buffer
 import semmle.code.cpp.commons.Scanf
 import semmle.code.cpp.models.implementations.Strcat
--- a/Year/Adding365DaysPerYear.ql
+++ b/Year/Adding365DaysPerYear.ql
@@ -13,7 +13,6 @@

 import cpp
 import LeapYear
-import semmle.code.cpp.dataflow.DataFlow

 from Expr source, Expr sink, PossibleYearArithmeticOperationCheckConfiguration config
 where config.hasFlow(DataFlow::exprNode(source), DataFlow::exprNode(sink))
--- a/Management/NtohlArrayNoBound.ql
+++ b/Management/NtohlArrayNoBound.ql
@@ -10,7 +10,6 @@

 import cpp
 import NtohlArrayNoBound
-import semmle.code.cpp.dataflow.DataFlow

 from NetworkToBufferSizeConfiguration bufConfig, DataFlow::Node source, DataFlow::Node sink
 where bufConfig.hasFlow(source, sink)
--- a/cpp/ql/src/Security/CWE/CWE-120/OverrunWrite.ql
+++ b/cpp/ql/src/Security/CWE/CWE-120/OverrunWrite.ql
@@ -15,7 +15,6 @@
 */

 import semmle.code.cpp.security.BufferWrite
-import semmle.code.cpp.commons.Alloc

 /*
 * See CWE-120/UnboundedWrite.ql for a summary of CWE-120 alert cases.
--- a/cpp/ql/src/Security/CWE/CWE-120/VeryLikelyOverrunWrite.ql
+++ b/cpp/ql/src/Security/CWE/CWE-120/VeryLikelyOverrunWrite.ql
@@ -15,7 +15,6 @@
 */

 import semmle.code.cpp.security.BufferWrite
-import semmle.code.cpp.commons.Alloc

 /*
 * See CWE-120/UnboundedWrite.ql for a summary of CWE-120 alert cases.
--- a/cpp/ql/src/experimental/Security/CWE/CWE-266/IncorrectPrivilegeAssignment.ql
+++ b/cpp/ql/src/experimental/Security/CWE/CWE-266/IncorrectPrivilegeAssignment.ql
@@ -16,7 +16,6 @@
 */

 import cpp
-import semmle.code.cpp.exprs.BitwiseOperation
 import semmle.code.cpp.valuenumbering.GlobalValueNumbering

 /**
--- a/cpp/ql/test/library-tests/dataflow/fields/ir-path-flow.ql
+++ b/cpp/ql/test/library-tests/dataflow/fields/ir-path-flow.ql
@@ -4,7 +4,6 @@

 import semmle.code.cpp.ir.dataflow.DataFlow
 import IRConfiguration
-import cpp
 import DataFlow::PathGraph

 from DataFlow::PathNode src, DataFlow::PathNode sink, IRConf conf
--- a/cpp/ql/test/library-tests/dataflow/fields/path-flow.ql
+++ b/cpp/ql/test/library-tests/dataflow/fields/path-flow.ql
@@ -4,7 +4,6 @@

 import semmle.code.cpp.dataflow.DataFlow
 import ASTConfiguration
-import cpp
 import DataFlow::PathGraph

 from DataFlow::PathNode src, DataFlow::PathNode sink, AstConf conf
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImplSpecific.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImplSpecific.qll
@@ -3,7 +3,6 @@
 private import csharp
 private import AssignableDefinitions
 private import SsaImpl as SsaImpl
-private import semmle.code.csharp.dataflow.SSA

 class BasicBlock = ControlFlow::BasicBlock;

--- a/csharp/ql/lib/semmle/code/csharp/exprs/Call.qll
+++ b/csharp/ql/lib/semmle/code/csharp/exprs/Call.qll
@@ -5,7 +5,6 @@
 */

 import Expr
-import semmle.code.csharp.Callable
 import semmle.code.csharp.dataflow.CallContext as CallContext
 private import semmle.code.csharp.dataflow.internal.DelegateDataFlow
 private import semmle.code.csharp.dataflow.internal.DataFlowDispatch
--- a/csharp/ql/lib/semmle/code/csharp/exprs/Creation.qll
+++ b/csharp/ql/lib/semmle/code/csharp/exprs/Creation.qll
@@ -3,7 +3,6 @@
 */

 import Expr
-import semmle.code.csharp.Callable
 private import semmle.code.csharp.frameworks.system.linq.Expressions
 private import semmle.code.csharp.TypeRef

--- a/csharp/ql/lib/semmle/code/csharp/exprs/Expr.qll
+++ b/csharp/ql/lib/semmle/code/csharp/exprs/Expr.qll
@@ -15,7 +15,6 @@ import Dynamic
 import Literal
 import LogicalOperation
 import semmle.code.csharp.controlflow.ControlFlowElement
-import semmle.code.csharp.Callable
 import semmle.code.csharp.Location
 import semmle.code.csharp.Stmt
 import semmle.code.csharp.Type
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/ExternalAPIsQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/ExternalAPIsQuery.qll
@@ -5,7 +5,6 @@

 import csharp
 private import semmle.code.csharp.dataflow.flowsources.Remote
-private import semmle.code.csharp.dataflow.TaintTracking
 private import semmle.code.csharp.frameworks.System
 private import semmle.code.csharp.dataflow.FlowSummary

--- a/Bugs/ICryptoTransform.qll
+++ b/Bugs/ICryptoTransform.qll
@@ -1,6 +1,4 @@
 import csharp
-import semmle.code.csharp.dataflow.DataFlow
-import csharp

 class ImplementsICryptoTransform extends Class {
  ImplementsICryptoTransform() {
--- a/Bugs/LeapYear/UnsafeYearConstruction.ql
+++ b/Bugs/LeapYear/UnsafeYearConstruction.ql
@@ -11,7 +11,6 @@

 import csharp
 import DataFlow::PathGraph
-import semmle.code.csharp.dataflow.TaintTracking

 class UnsafeYearCreationFromArithmeticConfiguration extends TaintTracking::Configuration {
  UnsafeYearCreationFromArithmeticConfiguration() {
--- a/Bugs/ParallelSink.qll
+++ b/Bugs/ParallelSink.qll
@@ -1,5 +1,4 @@
 import csharp
-import semmle.code.csharp.dataflow.DataFlow

 abstract class ParallelSink extends DataFlow::Node { }

--- a/Bugs/ThreadUnsafeICryptoTransformLambda.ql
+++ b/Bugs/ThreadUnsafeICryptoTransformLambda.ql
@@ -15,7 +15,6 @@
 */

 import csharp
-import semmle.code.csharp.dataflow.DataFlow
 import ParallelSink
 import ICryptoTransform

--- a/Features/CWE-020/UntrustedDataToExternalAPI.ql
+++ b/Features/CWE-020/UntrustedDataToExternalAPI.ql
@@ -10,7 +10,6 @@
 */

 import csharp
-import semmle.code.csharp.dataflow.TaintTracking
 import semmle.code.csharp.security.dataflow.ExternalAPIsQuery
 import DataFlow::PathGraph

--- a/Features/CWE-134/UncontrolledFormatString.ql
+++ b/Features/CWE-134/UncontrolledFormatString.ql
@@ -14,7 +14,6 @@
 import csharp
 import semmle.code.csharp.security.dataflow.flowsources.Remote
 import semmle.code.csharp.security.dataflow.flowsources.Local
-import semmle.code.csharp.dataflow.TaintTracking
 import semmle.code.csharp.frameworks.Format
 import DataFlow::PathGraph

--- a/Features/CWE-248/MissingASPNETGlobalErrorHandler.ql
+++ b/Features/CWE-248/MissingASPNETGlobalErrorHandler.ql
@@ -14,7 +14,6 @@

 import csharp
 import semmle.code.asp.WebConfig
-import semmle.code.csharp.XML

 class Application_Error extends Method {
  Application_Error() {
--- a/csharp/ql/src/Telemetry/ExternalApi.qll
+++ b/csharp/ql/src/Telemetry/ExternalApi.qll
@@ -2,13 +2,11 @@

 private import csharp
 private import semmle.code.csharp.dispatch.Dispatch
-private import semmle.code.csharp.dataflow.DataFlow
 private import semmle.code.csharp.dataflow.ExternalFlow
 private import semmle.code.csharp.dataflow.FlowSummary
 private import semmle.code.csharp.dataflow.internal.DataFlowImplCommon as DataFlowImplCommon
 private import semmle.code.csharp.dataflow.internal.DataFlowPrivate
 private import semmle.code.csharp.dataflow.internal.DataFlowDispatch as DataFlowDispatch
-private import semmle.code.csharp.dataflow.TaintTracking
 private import semmle.code.csharp.dataflow.internal.TaintTrackingPrivate
 private import semmle.code.csharp.security.dataflow.flowsources.Remote

--- a/Features/CWE-759/HashWithoutSalt.ql
+++ b/Features/CWE-759/HashWithoutSalt.ql
@@ -10,7 +10,6 @@

 import csharp
 import semmle.code.csharp.dataflow.DataFlow2
-import semmle.code.csharp.dataflow.TaintTracking
 import semmle.code.csharp.dataflow.TaintTracking2
 import DataFlow::PathGraph

--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/IRConstruction.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/IRConstruction.qll
@@ -13,7 +13,6 @@ private import TranslatedExpr
 private import TranslatedStmt
 private import desugar.Foreach
 private import TranslatedFunction
-private import experimental.ir.Util
 private import experimental.ir.internal.IRCSharpLanguage as Language

 TranslatedElement getInstructionTranslatedElement(Instruction instruction) {
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedCall.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedCall.qll
@@ -5,7 +5,6 @@ private import InstructionTag
 private import TranslatedElement
 private import TranslatedExpr
 private import TranslatedInitialization
-private import experimental.ir.Util
 private import experimental.ir.implementation.raw.internal.common.TranslatedCallBase
 private import experimental.ir.internal.IRCSharpLanguage as Language

--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedElement.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedElement.qll
@@ -10,7 +10,6 @@ private import TranslatedCondition
 private import TranslatedFunction
 private import TranslatedStmt
 private import IRConstruction
-private import experimental.ir.Util
 private import experimental.ir.internal.IRCSharpLanguage as Language
 private import desugar.Foreach
 private import desugar.Delegate
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedExpr.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedExpr.qll
@@ -16,7 +16,6 @@ private import common.TranslatedExprBase
 private import desugar.Delegate
 private import desugar.internal.TranslatedCompilerGeneratedCall
 import TranslatedCall
-private import experimental.ir.Util
 private import experimental.ir.internal.IRCSharpLanguage as Language

 /**
--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedInitialization.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/TranslatedInitialization.qll
@@ -11,7 +11,6 @@ private import InstructionTag
 private import TranslatedElement
 private import TranslatedExpr
 private import TranslatedFunction
-private import experimental.ir.Util
 private import IRInternal
 private import desugar.Delegate

--- a/csharp/ql/src/experimental/ir/implementation/raw/internal/common/TranslatedCallBase.qll
+++ b/csharp/ql/src/experimental/ir/implementation/raw/internal/common/TranslatedCallBase.qll
@@ -9,7 +9,6 @@ private import experimental.ir.implementation.internal.OperandTag
 private import experimental.ir.implementation.raw.internal.InstructionTag
 private import experimental.ir.implementation.raw.internal.TranslatedElement
 private import experimental.ir.implementation.raw.internal.TranslatedExpr
-private import experimental.ir.Util
 private import experimental.ir.internal.CSharpType
 private import experimental.ir.internal.IRCSharpLanguage as Language
 private import TranslatedExprBase
--- a/csharp/ql/test/TestUtilities/InlineExpectationsTestPrivate.qll
+++ b/csharp/ql/test/TestUtilities/InlineExpectationsTestPrivate.qll
@@ -1,5 +1,4 @@
 import csharp
-import semmle.code.csharp.Comments

 /**
 * A class representing line comments in C# used by the InlineExpectations core code
--- a/csharp/ql/test/library-tests/cil/dataflow/TaintTracking.ql
+++ b/csharp/ql/test/library-tests/cil/dataflow/TaintTracking.ql
@@ -1,5 +1,4 @@
 import csharp
-import semmle.code.csharp.dataflow.TaintTracking
 // Test that all the copies of the taint tracking library can be imported
 // simultaneously without errors.
 import semmle.code.csharp.dataflow.TaintTracking2
--- a/csharp/ql/test/library-tests/commons/Disposal/DisposedVariables.ql
+++ b/csharp/ql/test/library-tests/commons/Disposal/DisposedVariables.ql
@@ -1,5 +1,4 @@
 import semmle.code.csharp.commons.Disposal
-import csharp

 from Variable v
 where
--- a/csharp/ql/test/library-tests/csharp7/LocalTaintFlow.ql
+++ b/csharp/ql/test/library-tests/csharp7/LocalTaintFlow.ql
@@ -1,5 +1,4 @@
 import csharp
-import semmle.code.csharp.dataflow.TaintTracking

 from DataFlow::Node pred, DataFlow::Node succ
 where
--- a/csharp/ql/test/library-tests/csharp7/TaintReaches.ql
+++ b/csharp/ql/test/library-tests/csharp7/TaintReaches.ql
@@ -1,5 +1,4 @@
 import csharp
-import semmle.code.csharp.dataflow.TaintTracking

 from StringLiteral l, DataFlow::Node n
 where TaintTracking::localTaintStep+(DataFlow::exprNode(l), n)
--- a/csharp/ql/test/library-tests/frameworks/JsonNET/Json.ql
+++ b/csharp/ql/test/library-tests/frameworks/JsonNET/Json.ql
@@ -1,5 +1,4 @@
 import csharp
-import semmle.code.csharp.dataflow.TaintTracking

 class Configuration extends TaintTracking::Configuration {
  Configuration() { this = "Json.NET test" }
--- a/csharp/ql/test/library-tests/frameworks/NHibernate/DataFlow.ql
+++ b/csharp/ql/test/library-tests/frameworks/NHibernate/DataFlow.ql
@@ -1,5 +1,4 @@
 import csharp
-import semmle.code.csharp.dataflow.TaintTracking

 class MyConfiguration extends TaintTracking::Configuration {
  MyConfiguration() { this = "MyConfiguration" }
--- a/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/NosqlInjectionATM.qll
+++ b/javascript/ql/experimental/adaptivethreatmodeling/lib/experimental/adaptivethreatmodeling/NosqlInjectionATM.qll
@@ -7,7 +7,6 @@
 import javascript
 private import semmle.javascript.heuristics.SyntacticHeuristics
 private import semmle.javascript.security.dataflow.NosqlInjectionCustomizations
-private import semmle.javascript.security.TaintedObject
 import AdaptiveThreatModeling
 private import CoreKnowledge as CoreKnowledge
 private import StandardEndpointFilters as StandardEndpointFilters
--- a/javascript/ql/lib/Expressions/ExprHasNoEffect.qll
+++ b/javascript/ql/lib/Expressions/ExprHasNoEffect.qll
@@ -4,7 +4,6 @@

 import javascript
 import DOMProperties
-import semmle.javascript.frameworks.xUnit

 /**
 * Holds if `e` appears in a syntactic context where its value is discarded.
--- a/javascript/ql/lib/semmle/javascript/frameworks/NoSQL.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/NoSQL.qll
@@ -3,7 +3,6 @@
 */

 import javascript
-import semmle.javascript.Promises

 /** Provices classes for modelling NoSQL query sinks. */
 module NoSql {
--- a/javascript/ql/lib/semmle/javascript/frameworks/SQL.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/SQL.qll
@@ -3,7 +3,6 @@
 */

 import javascript
-import semmle.javascript.Promises

 module SQL {
  /** A string-valued expression that is interpreted as a SQL command. */
--- a/javascript/ql/lib/semmle/javascript/frameworks/Testing.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Testing.qll
@@ -3,7 +3,6 @@
 */

 import javascript
-import semmle.javascript.frameworks.xUnit
 import semmle.javascript.frameworks.TestingCustomizations

 /**
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/BrokenCryptoAlgorithmCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/BrokenCryptoAlgorithmCustomizations.qll
@@ -6,7 +6,6 @@

 import javascript
 private import semmle.javascript.security.SensitiveActions
-private import semmle.javascript.frameworks.CryptoLibraries

 module BrokenCryptoAlgorithm {
  /**
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirect.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirect.qll
@@ -1,7 +1,6 @@
 /** DEPRECATED. Import `ClientSideUrlRedirectQuery` instead. */

 import javascript
-import semmle.javascript.security.dataflow.RemoteFlowSources
 import UrlConcatenation
 private import ClientSideUrlRedirectQuery as ClientSideUrlRedirectQuery // ignore-query-import

--- a/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectCustomizations.qll
@@ -5,7 +5,6 @@
 */

 import javascript
-import semmle.javascript.security.dataflow.RemoteFlowSources

 module ClientSideUrlRedirect {
  /**
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/ClientSideUrlRedirectQuery.qll
@@ -8,7 +8,6 @@
 */

 import javascript
-import semmle.javascript.security.dataflow.RemoteFlowSources
 import UrlConcatenation
 import ClientSideUrlRedirectCustomizations::ClientSideUrlRedirect

--- a/javascript/ql/lib/semmle/javascript/security/dataflow/CommandInjectionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/CommandInjectionCustomizations.qll
@@ -5,7 +5,6 @@
 */

 import javascript
-import semmle.javascript.security.dataflow.RemoteFlowSources

 module CommandInjection {
  /**
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/DifferentKindsComparisonBypass.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/DifferentKindsComparisonBypass.qll
@@ -1,7 +1,6 @@
 /** DEPRECATED. Import `DifferentKindsComparisonBypassQuery` instead. */

 import javascript
-import semmle.javascript.security.dataflow.RemoteFlowSources
 private import DifferentKindsComparisonBypassQuery as DifferentKindsComparisonBypassQuery // ignore-query-import

 /** DEPRECATED. Import `DifferentKindsComparisonBypassQuery` instead. */
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/DifferentKindsComparisonBypassCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/DifferentKindsComparisonBypassCustomizations.qll
@@ -5,7 +5,6 @@
 */

 import javascript
-import semmle.javascript.security.dataflow.RemoteFlowSources

 module DifferentKindsComparisonBypass {
  /**
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/DifferentKindsComparisonBypassQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/DifferentKindsComparisonBypassQuery.qll
@@ -9,7 +9,6 @@
 */

 import javascript
-import semmle.javascript.security.dataflow.RemoteFlowSources
 import DifferentKindsComparisonBypassCustomizations::DifferentKindsComparisonBypass

 /**
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/FileAccessToHttpCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/FileAccessToHttpCustomizations.qll
@@ -5,7 +5,6 @@
 */

 import javascript
-import semmle.javascript.security.dataflow.RemoteFlowSources

 module FileAccessToHttp {
  /**
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/HttpToFileAccessSpecific.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/HttpToFileAccessSpecific.qll
@@ -3,7 +3,6 @@
 */

 import javascript
-import semmle.javascript.security.dataflow.RemoteFlowSources
 private import HttpToFileAccessCustomizations::HttpToFileAccess

 /**
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/IncompleteHtmlAttributeSanitizationCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/IncompleteHtmlAttributeSanitizationCustomizations.qll
@@ -5,7 +5,6 @@
 */

 import javascript
-import semmle.javascript.security.dataflow.RemoteFlowSources
 import semmle.javascript.security.IncompleteBlacklistSanitizer

 module IncompleteHtmlAttributeSanitization {
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/IndirectCommandInjectionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/IndirectCommandInjectionCustomizations.qll
@@ -5,7 +5,6 @@
 */

 import javascript
-import semmle.javascript.security.dataflow.RemoteFlowSources

 module IndirectCommandInjection {
  /**
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/InsufficientPasswordHashCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/InsufficientPasswordHashCustomizations.qll
@@ -6,7 +6,6 @@

 import javascript
 private import semmle.javascript.security.SensitiveActions
-private import semmle.javascript.frameworks.CryptoLibraries

 module InsufficientPasswordHash {
  /**
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/TypeConfusionThroughParameterTamperingCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/TypeConfusionThroughParameterTamperingCustomizations.qll
@@ -5,7 +5,6 @@
 */

 import javascript
-import semmle.javascript.security.dataflow.RemoteFlowSources
 private import semmle.javascript.dataflow.InferredTypes

 module TypeConfusionThroughParameterTampering {
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserialization.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserialization.qll
@@ -1,7 +1,6 @@
 /** DEPRECATED. Import `UnsafeDeserializationQuery` instead. */

 import javascript
-import semmle.javascript.security.dataflow.RemoteFlowSources
 private import UnsafeDeserializationQuery as UnsafeDeserializationQuery // ignore-query-import

 /** DEPRECATED. Import `UnsafeDeserializationQuery` instead. */
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserializationCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserializationCustomizations.qll
@@ -5,7 +5,6 @@
 */

 import javascript
-import semmle.javascript.security.dataflow.RemoteFlowSources

 module UnsafeDeserialization {
  /**
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserializationQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeDeserializationQuery.qll
@@ -7,7 +7,6 @@
 */

 import javascript
-import semmle.javascript.security.dataflow.RemoteFlowSources
 import UnsafeDeserializationCustomizations::UnsafeDeserialization

 /**
--- a/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeShellCommandConstructionCustomizations.qll
+++ b/javascript/ql/lib/semmle/javascript/security/dataflow/UnsafeShellCommandConstructionCustomizations.qll
@@ -5,7 +5,6 @@
 */

 import javascript
-private import semmle.javascript.security.dataflow.RemoteFlowSources
 private import semmle.javascript.PackageExports as Exports
 private import semmle.javascript.dataflow.InferredTypes

--- a/javascript/ql/src/Security/CWE-915/PrototypePollutingMergeCall.ql
+++ b/javascript/ql/src/Security/CWE-915/PrototypePollutingMergeCall.ql
@@ -20,7 +20,6 @@
 import javascript
 import semmle.javascript.security.dataflow.PrototypePollutionQuery
 import DataFlow::PathGraph
-import semmle.javascript.dependencies.Dependencies

 from
  Configuration cfg, DataFlow::PathNode source, DataFlow::PathNode sink, string moduleName,
--- a/javascript/ql/test/library-tests/CryptoLibraries/CryptographicKey.ql
+++ b/javascript/ql/test/library-tests/CryptoLibraries/CryptographicKey.ql
@@ -1,5 +1,4 @@
 import javascript
-import semmle.javascript.frameworks.CryptoLibraries

 from CryptographicKey key
 select key
--- a/javascript/ql/test/library-tests/CryptoLibraries/CryptographicOperation.ql
+++ b/javascript/ql/test/library-tests/CryptoLibraries/CryptographicOperation.ql
@@ -1,5 +1,4 @@
 import javascript
-import semmle.javascript.frameworks.CryptoLibraries

 from CryptographicOperation operation
 select operation, operation.getAlgorithm().getName(), operation.getInput()
--- a/javascript/ql/test/library-tests/TaintBarriers/ExampleConfiguration.qll
+++ b/javascript/ql/test/library-tests/TaintBarriers/ExampleConfiguration.qll
@@ -1,5 +1,4 @@
 import javascript
-import semmle.javascript.security.dataflow.RemoteFlowSources

 class ExampleConfiguration extends TaintTracking::Configuration {
  ExampleConfiguration() { this = "ExampleConfiguration" }
--- a/python/ql/lib/semmle/python/Module.qll
+++ b/python/ql/lib/semmle/python/Module.qll
@@ -1,5 +1,4 @@
 import python
-private import semmle.python.objects.ObjectAPI
 private import semmle.python.objects.Modules
 private import semmle.python.internal.CachedStages

--- a/python/ql/lib/semmle/python/dataflow/old/StateTracking.qll
+++ b/python/ql/lib/semmle/python/dataflow/old/StateTracking.qll
@@ -9,7 +9,6 @@
 */

 import python
-private import semmle.python.pointsto.Base
 private import semmle.python.pointsto.PointsTo
 private import semmle.python.pointsto.PointsToContext
 private import semmle.python.objects.ObjectInternal
--- a/python/ql/lib/semmle/python/essa/SsaDefinitions.qll
+++ b/python/ql/lib/semmle/python/essa/SsaDefinitions.qll
@@ -4,7 +4,6 @@
 */

 import python
-private import semmle.python.pointsto.Base
 private import semmle.python.internal.CachedStages

 cached
--- a/python/ql/lib/semmle/python/frameworks/Requests.qll
+++ b/python/ql/lib/semmle/python/frameworks/Requests.qll
@@ -9,7 +9,6 @@
 private import python
 private import semmle.python.Concepts
 private import semmle.python.ApiGraphs
-private import semmle.python.dataflow.new.DataFlow
 private import semmle.python.dataflow.new.TaintTracking
 private import semmle.python.frameworks.internal.InstanceTaintStepsHelper
 private import semmle.python.frameworks.Stdlib
--- a/python/ql/lib/semmle/python/objects/Modules.qll
+++ b/python/ql/lib/semmle/python/objects/Modules.qll
@@ -136,6 +136,7 @@ class PackageObjectInternal extends ModuleObjectInternal, TPackageObject {
  /** Gets the init module of this package */
  PythonModuleObjectInternal getInitModule() { result = TPythonModule(this.getSourceModule()) }

+  /** Holds if the folder for this package has no init module. */
  predicate hasNoInitModule() {
    exists(Folder f |
      f = this.getFolder() and
--- a/python/ql/lib/semmle/python/types/FunctionObject.qll
+++ b/python/ql/lib/semmle/python/types/FunctionObject.qll
@@ -3,7 +3,6 @@ import semmle.python.types.Exceptions
 private import semmle.python.pointsto.PointsTo
 private import semmle.python.objects.Callables
 private import semmle.python.libraries.Zope
-private import semmle.python.pointsto.Base
 private import semmle.python.objects.ObjectInternal
 private import semmle.python.types.Builtins

--- a/python/ql/lib/semmle/python/types/Object.qll
+++ b/python/ql/lib/semmle/python/types/Object.qll
@@ -1,5 +1,4 @@
 import python
-private import semmle.python.objects.ObjectAPI
 private import semmle.python.objects.ObjectInternal
 private import semmle.python.types.Builtins
 private import semmle.python.internal.CachedStages
--- a/python/ql/lib/semmle/python/web/falcon/Request.qll
+++ b/python/ql/lib/semmle/python/web/falcon/Request.qll
@@ -2,7 +2,6 @@ import python
 import semmle.python.dataflow.TaintTracking
 import semmle.python.web.Http
 import semmle.python.web.falcon.General
-import semmle.python.security.strings.External

 /** https://falcon.readthedocs.io/en/stable/api/request_and_response.html */
 deprecated class FalconRequest extends TaintKind {
--- a/python/ql/lib/semmle/python/web/falcon/Response.qll
+++ b/python/ql/lib/semmle/python/web/falcon/Response.qll
@@ -2,7 +2,6 @@ import python
 import semmle.python.dataflow.TaintTracking
 import semmle.python.web.Http
 import semmle.python.web.falcon.General
-import semmle.python.security.strings.External

 /** https://falcon.readthedocs.io/en/stable/api/request_and_response.html */
 deprecated class FalconResponse extends TaintKind {
--- a/python/ql/lib/semmle/python/web/pyramid/Response.qll
+++ b/python/ql/lib/semmle/python/web/pyramid/Response.qll
@@ -3,7 +3,6 @@ import semmle.python.dataflow.TaintTracking
 import semmle.python.security.strings.Basic
 import semmle.python.web.Http
 private import semmle.python.web.pyramid.View
-private import semmle.python.web.Http

 /**
 * A pyramid response, which is vulnerable to any sort of
--- a/python/ql/src/Classes/DefineEqualsWhenAddingAttributes.ql
+++ b/python/ql/src/Classes/DefineEqualsWhenAddingAttributes.ql
@@ -11,7 +11,6 @@
 */

 import python
-import semmle.python.SelfAttribute
 import Equality

 predicate class_stores_to_attribute(ClassValue cls, SelfAttributeStore store, string name) {
--- a/python/ql/src/Classes/MaybeUndefinedClassAttribute.ql
+++ b/python/ql/src/Classes/MaybeUndefinedClassAttribute.ql
@@ -11,7 +11,6 @@
 */

 import python
-import semmle.python.SelfAttribute
 import ClassAttributes

 predicate guarded_by_other_attribute(SelfAttributeRead a, CheckClass c) {
--- a/python/ql/src/Classes/UndefinedClassAttribute.ql
+++ b/python/ql/src/Classes/UndefinedClassAttribute.ql
@@ -11,7 +11,6 @@
 */

 import python
-import semmle.python.SelfAttribute
 import ClassAttributes

 predicate undefined_class_attribute(SelfAttributeRead a, CheckClass c, int line, string name) {
--- a/python/ql/src/Expressions/Formatting/UnusedArgumentIn3101Format.ql
+++ b/python/ql/src/Expressions/Formatting/UnusedArgumentIn3101Format.ql
@@ -10,7 +10,6 @@
 * @id py/str-format/surplus-argument
 */

-import python
 import python
 import AdvancedFormatting

--- a/python/ql/src/Lexical/FCommentedOutCode.ql
+++ b/python/ql/src/Lexical/FCommentedOutCode.ql
@@ -10,7 +10,6 @@

 import python
 import Lexical.CommentedOutCode
-import python

 from File f, int n
 where n = count(CommentedOutCodeLine c | not c.maybeExampleCode() and c.getLocation().getFile() = f)
--- a/python/ql/src/Resources/FileOpen.qll
+++ b/python/ql/src/Resources/FileOpen.qll
@@ -1,7 +1,6 @@
 /** Contains predicates concerning when and where files are opened and closed. */

 import python
-import semmle.python.GuardedControlFlow
 import semmle.python.pointsto.Filters

 /** Holds if `open` is a call that returns a newly opened file */
--- a/python/ql/src/experimental/Security/CWE-348/ClientSuppliedIpUsedInSecurityCheckLib.qll
+++ b/python/ql/src/experimental/Security/CWE-348/ClientSuppliedIpUsedInSecurityCheckLib.qll
@@ -1,8 +1,8 @@
 private import python
 private import semmle.python.Concepts
 private import semmle.python.ApiGraphs
-private import semmle.python.dataflow.new.DataFlow
 private import semmle.python.dataflow.new.RemoteFlowSources
+private import semmle.python.dataflow.new.DataFlow

 /**
 * A data flow source of the client ip obtained according to the remote endpoint identifier specified
--- a/python/ql/test/library-tests/PointsTo/comparisons/PointsTo.ql
+++ b/python/ql/test/library-tests/PointsTo/comparisons/PointsTo.ql
@@ -1,5 +1,4 @@
 import python
-import semmle.python.objects.ObjectAPI

 from int line, ControlFlowNode f, Value v
 where
--- a/python/ql/test/library-tests/PointsTo/global/Global.ql
+++ b/python/ql/test/library-tests/PointsTo/global/Global.ql
@@ -1,5 +1,4 @@
 import python
-import python
 import semmle.python.pointsto.PointsTo
 import semmle.python.pointsto.PointsToContext
 import semmle.python.objects.ObjectInternal
--- a/python/ql/test/library-tests/PointsTo/inheritance/Declares.ql
+++ b/python/ql/test/library-tests/PointsTo/inheritance/Declares.ql
@@ -1,5 +1,4 @@
 import python
-import semmle.python.pointsto.Base

 from ClassObject cls, string name
 where class_declares_attribute(cls, name)
--- a/python/ql/test/library-tests/PointsTo/new/ClassMethod.ql
+++ b/python/ql/test/library-tests/PointsTo/new/ClassMethod.ql
@@ -1,5 +1,4 @@
 import python
-import semmle.python.types.Descriptors
 import Util

 from ClassMethodObject cm, CallNode call
--- a/python/ql/test/library-tests/PointsTo/new/PointsToMissing.ql
+++ b/python/ql/test/library-tests/PointsTo/new/PointsToMissing.ql
@@ -1,7 +1,6 @@
 import python
 import Util
 import semmle.python.pointsto.PointsTo
-import semmle.python.objects.ObjectInternal

 /* This test should return _no_ results. */
 predicate relevant_node(ControlFlowNode n) {
--- a/python/ql/test/library-tests/PointsTo/new/PointsToUnknown.ql
+++ b/python/ql/test/library-tests/PointsTo/new/PointsToUnknown.ql
@@ -1,7 +1,6 @@
 import python
 import Util
 import semmle.python.pointsto.PointsTo
-import semmle.python.objects.ObjectInternal

 from ControlFlowNode f, ControlFlowNode x
 where PointsTo::pointsTo(f, _, ObjectInternal::unknown(), x)
--- a/python/ql/test/library-tests/attributes/SelfAttribute.ql
+++ b/python/ql/test/library-tests/attributes/SelfAttribute.ql
@@ -1,5 +1,4 @@
 import python
-import semmle.python.SelfAttribute

 from SelfAttributeRead sa, int line, string g, string l
 where
--- a/python/ql/test/library-tests/descriptors/Methods.ql
+++ b/python/ql/test/library-tests/descriptors/Methods.ql
@@ -1,5 +1,4 @@
 import python
-import semmle.python.types.Descriptors

 int lineof(Object o) { result = o.getOrigin().getLocation().getStartLine() }

--- a/python/ql/test/library-tests/descriptors/Properties.ql
+++ b/python/ql/test/library-tests/descriptors/Properties.ql
@@ -1,5 +1,4 @@
 import python
-import semmle.python.types.Descriptors

 from PropertyValue p, string method_name, FunctionValue method
 where
--- a/python/ql/test/library-tests/security/command-execution/CommandSinks.expected
+++ b/python/ql/test/library-tests/security/command-execution/CommandSinks.expected
@@ -1,4 +1,4 @@
-WARNING: Type CommandSink has been deprecated and may be removed in future (CommandSinks.ql:5,6-17)
+WARNING: Type CommandSink has been deprecated and may be removed in future (CommandSinks.ql:4,6-17)
 | fabric_v1_test.py:8:7:8:28 | FabricV1Commands | externally controlled string |
 | fabric_v1_test.py:9:5:9:27 | FabricV1Commands | externally controlled string |
 | fabric_v1_test.py:10:6:10:38 | FabricV1Commands | externally controlled string |
--- a/python/ql/test/library-tests/security/command-execution/CommandSinks.ql
+++ b/python/ql/test/library-tests/security/command-execution/CommandSinks.ql
@@ -1,6 +1,5 @@
 import python
 import semmle.python.security.injection.Command
-import semmle.python.security.strings.Untrusted

 from CommandSink sink, TaintKind kind
 where sink.sinks(kind)
--- a/python/ql/test/library-tests/web/django/SqlInjectionSinks.ql
+++ b/python/ql/test/library-tests/web/django/SqlInjectionSinks.ql
@@ -2,7 +2,6 @@ import python
 import semmle.python.security.injection.Sql
 import semmle.python.web.django.Db
 import semmle.python.web.django.Model
-import semmle.python.security.strings.Untrusted

 from SqlInjectionSink sink, TaintKind kind
 where sink.sinks(kind)
--- a/ql/ql/src/codeql_ql/style/RedundantImportQuery.qll
+++ b/ql/ql/src/codeql_ql/style/RedundantImportQuery.qll
@@ -0,0 +1,67 @@
+import ql
+
+Import imports(Import imp) {
+  (
+    exists(File file, TopLevel top |
+      imp.getResolvedModule().asFile() = file and
+      top.getLocation().getFile() = file and
+      result = top.getAMember()
+    )
+    or
+    exists(Module mod |
+      imp.getResolvedModule().asModule() = mod and
+      result = mod.getAMember()
+    )
+  )
+}
+
+Import getAnImport(AstNode parent) {
+  result = parent.(TopLevel).getAMember()
+  or
+  result = parent.(Module).getAMember()
+}
+
+pragma[inline]
+predicate importsFromSameFolder(Import a, Import b) {
+  exists(string base |
+    a.getImportString().regexpCapture("(.*)\\.[^\\.]*", 1) = base and
+    b.getImportString().regexpCapture("(.*)\\.[^\\.]*", 1) = base
+  )
+  or
+  not a.getImportString().matches("%.%") and
+  not b.getImportString().matches("%.%")
+}
+
+predicate problem(Import imp, Import redundant, string message) {
+  not exists(imp.importedAs()) and
+  not exists(redundant.importedAs()) and
+  // skip the top-level language files, they have redundant imports, and that's fine.
+  not exists(imp.getLocation().getFile().getParentContainer().getFile("qlpack.yml")) and
+  // skip the DataFlowImpl.qll and similar, they have redundant imports in some copies.
+  not imp.getLocation()
+      .getFile()
+      .getBaseName()
+      .regexpMatch([".*Impl\\d?\\.qll", "DataFlowImpl.*\\.qll"]) and
+  // skip two imports that imports different things from the same folder.
+  not importsFromSameFolder(imp, redundant) and
+  // if the redundant is public, and the imp is private, then the redundant might add things that are exported.
+  not (imp.isPrivate() and not redundant.isPrivate()) and
+  // Actually checking if the import is redundant:
+  exists(AstNode parent |
+    imp = getAnImport(parent) and
+    redundant = getAnImport(parent) and
+    redundant.getLocation().getStartLine() > imp.getLocation().getStartLine()
+  |
+    message = "Redundant import, the module is already imported inside $@." and
+    // only looking for things directly imported one level down. Otherwise things gets complicated (lots of cycles).
+    exists(Import inner | inner = imports(imp) |
+      redundant.getResolvedModule() = inner.getResolvedModule() and
+      not inner.isPrivate() and // if the inner is private, then it's not propagated out.
+      not exists(inner.importedAs())
+    )
+    or
+    message = "Duplicate import, the module is already imported by $@." and
+    // two different import statements, that import the same thing
+    imp.getResolvedModule() = redundant.getResolvedModule()
+  )
+}
--- a/ql/ql/src/ide-contextual-queries/localDefinitions.ql
+++ b/ql/ql/src/ide-contextual-queries/localDefinitions.ql
@@ -9,7 +9,6 @@

 import ql
 import Definitions
-import codeql.IDEContextual

 external string selectedSourceFile();

--- a/ql/ql/src/ide-contextual-queries/localReferences.ql
+++ b/ql/ql/src/ide-contextual-queries/localReferences.ql
@@ -9,7 +9,6 @@

 import ql
 import Definitions
-import codeql.IDEContextual

 external string selectedSourceFile();

--- a/ql/ql/src/queries/style/RedundantImport.ql
+++ b/ql/ql/src/queries/style/RedundantImport.ql
@@ -0,0 +1,17 @@
+/**
+ * @name Redundant import
+ * @description An import that is redundant due to an earlier import
+ * @kind problem
+ * @problem.severity warning
+ * @id ql/redundant-import
+ * @tags correctness
+ *       performance
+ * @precision high
+ */
+
+import ql
+import codeql_ql.style.RedundantImportQuery
+
+from Import imp, Import redundant, string message
+where problem(imp, redundant, message)
+select redundant, message, imp, imp.getImportString()
--- a/ruby/ql/lib/codeql/ruby/ast/Expr.qll
+++ b/ruby/ql/lib/codeql/ruby/ast/Expr.qll
@@ -1,6 +1,5 @@
 private import codeql.ruby.AST
 private import codeql.ruby.CFG
-private import codeql.ruby.ast.Constant
 private import internal.AST
 private import internal.Constant
 private import internal.Expr
--- a/Show More
+++ b/Show More