diff --git a/c/cert/src/rules/INT34-C/ExprShiftedbyNegativeOrGreaterPrecisionOperand.ql b/c/cert/src/rules/INT34-C/ExprShiftedbyNegativeOrGreaterPrecisionOperand.ql
index 2086d2da2..80bd212aa 100644
--- a/c/cert/src/rules/INT34-C/ExprShiftedbyNegativeOrGreaterPrecisionOperand.ql
+++ b/c/cert/src/rules/INT34-C/ExprShiftedbyNegativeOrGreaterPrecisionOperand.ql
@@ -13,7 +13,7 @@
 import cpp
 import codingstandards.c.cert
 import semmle.code.cpp.rangeanalysis.SimpleRangeAnalysis
-import semmle.code.cpp.ir.internal.ASTValueNumbering
+import semmle.code.cpp.valuenumbering.GlobalValueNumbering
 import semmle.code.cpp.controlflow.Guards
 
 /*
diff --git a/c/cert/src/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.ql b/c/cert/src/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.ql
index 24e55f80d..374220772 100644
--- a/c/cert/src/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.ql
+++ b/c/cert/src/rules/STR31-C/StringsHasSufficientSpaceForTheNullTerminator.ql
@@ -16,7 +16,6 @@
 import cpp
 import codingstandards.c.cert
 import semmle.code.cpp.dataflow.TaintTracking
-import semmle.code.cpp.dataflow.internal.TaintTrackingUtil
 import codingstandards.cpp.PossiblyUnsafeStringOperation
 
 /**
diff --git a/c/cert/src/rules/STR32-C/NonNullTerminatedToFunctionThatExpectsAString.ql b/c/cert/src/rules/STR32-C/NonNullTerminatedToFunctionThatExpectsAString.ql
index a65e7958b..365136f99 100644
--- a/c/cert/src/rules/STR32-C/NonNullTerminatedToFunctionThatExpectsAString.ql
+++ b/c/cert/src/rules/STR32-C/NonNullTerminatedToFunctionThatExpectsAString.ql
@@ -16,7 +16,6 @@ import cpp
 import codingstandards.c.cert
 import codingstandards.cpp.Naming
 import semmle.code.cpp.dataflow.TaintTracking
-import semmle.code.cpp.dataflow.internal.TaintTrackingUtil
 import codingstandards.cpp.PossiblyUnsafeStringOperation
 
 /**
diff --git a/cpp/common/src/codingstandards/cpp/Expr.qll b/cpp/common/src/codingstandards/cpp/Expr.qll
index f5ece8b76..4ed50b498 100644
--- a/cpp/common/src/codingstandards/cpp/Expr.qll
+++ b/cpp/common/src/codingstandards/cpp/Expr.qll
@@ -1,5 +1,5 @@
 import cpp
-private import semmle.code.cpp.ir.internal.ASTValueNumbering
+private import semmle.code.cpp.valuenumbering.GlobalValueNumbering
 import codingstandards.cpp.AccessPath
 
 /** A full expression as defined in [intro.execution] of N3797. */
diff --git a/cpp/common/src/codingstandards/cpp/lifetimes/lifetimeprofile/LifetimeProfile.qll b/cpp/common/src/codingstandards/cpp/lifetimes/lifetimeprofile/LifetimeProfile.qll
index bc7338fc9..32d002624 100644
--- a/cpp/common/src/codingstandards/cpp/lifetimes/lifetimeprofile/LifetimeProfile.qll
+++ b/cpp/common/src/codingstandards/cpp/lifetimes/lifetimeprofile/LifetimeProfile.qll
@@ -1,6 +1,5 @@
 import cpp
 private import semmle.code.cpp.dataflow.DataFlow
-private import semmle.code.cpp.dataflow.internal.FlowVar
 private import semmle.code.cpp.controlflow.Nullness
 private import codingstandards.cpp.Dereferenced
 private import codingstandards.cpp.Expr
diff --git a/cpp/common/src/codingstandards/cpp/rules/basicstringmaynotbenullterminated/BasicStringMayNotBeNullTerminated.qll b/cpp/common/src/codingstandards/cpp/rules/basicstringmaynotbenullterminated/BasicStringMayNotBeNullTerminated.qll
index 3282c75e1..e27f09fd9 100644
--- a/cpp/common/src/codingstandards/cpp/rules/basicstringmaynotbenullterminated/BasicStringMayNotBeNullTerminated.qll
+++ b/cpp/common/src/codingstandards/cpp/rules/basicstringmaynotbenullterminated/BasicStringMayNotBeNullTerminated.qll
@@ -10,7 +10,6 @@ import semmle.code.cpp.security.BufferWrite
 import semmle.code.cpp.commons.Buffer
 import semmle.code.cpp.dataflow.DataFlow
 import semmle.code.cpp.dataflow.TaintTracking
-import semmle.code.cpp.dataflow.internal.TaintTrackingUtil
 import codingstandards.cpp.PossiblyUnsafeStringOperation
 
 abstract class BasicStringMayNotBeNullTerminatedSharedQuery extends Query { }