diff --git a/cpp/ql/lib/semmle/code/cpp/temp/DataFlow.qll b/cpp/ql/lib/semmle/code/cpp/temp/DataFlow.qll
new file mode 100644
index 00000000000..59f4fcac5d9
--- /dev/null
+++ b/cpp/ql/lib/semmle/code/cpp/temp/DataFlow.qll
@@ -0,0 +1,33 @@
+/**
+ * Provides a library for local (intra-procedural) and global (inter-procedural)
+ * data flow analysis: deciding whether data can flow from a _source_ to a
+ * _sink_.
+ *
+ * Unless configured otherwise, _flow_ means that the exact value of
+ * the source may reach the sink. We do not track flow across pointer
+ * dereferences or array indexing. To track these types of flow, where the
+ * exact value may not be preserved, import
+ * `semmle.code.cpp.dataflow.TaintTracking`.
+ *
+ * To use global (interprocedural) data flow, extend the class
+ * `DataFlow::Configuration` as documented on that class. To use local
+ * (intraprocedural) data flow between expressions, call
+ * `DataFlow::localExprFlow`. For more general cases of local data flow, call
+ * `DataFlow::localFlow` or `DataFlow::localFlowStep` with arguments of type
+ * `DataFlow::Node`.
+ */
+
+ import cpp
+
+ /**
+  * DEPRECATED: Use `semmle.code.cpp.dataflow.new.DataFlow` instead.
+  *
+  * Provides classes for performing local (intra-procedural) and
+  * global (inter-procedural) data flow analyses.
+  */
+ module DataFlow {
+   private import semmle.code.cpp.dataflow.internal.DataFlowImplSpecific
+   private import codeql.dataflow.DataFlow
+   import DataFlowMake<CppOldDataFlow>
+   import semmle.code.cpp.dataflow.internal.DataFlowImpl1
+ }
\ No newline at end of file
diff --git a/cpp/ql/lib/semmle/code/cpp/temp/DataFlow2.qll b/cpp/ql/lib/semmle/code/cpp/temp/DataFlow2.qll
new file mode 100644
index 00000000000..a768b617677
--- /dev/null
+++ b/cpp/ql/lib/semmle/code/cpp/temp/DataFlow2.qll
@@ -0,0 +1,22 @@
+/**
+ * Provides a `DataFlow2` module, which is a copy of the `DataFlow` module. Use
+ * this class when data-flow configurations must depend on each other. Two
+ * classes extending `DataFlow::Configuration` should never depend on each
+ * other, but one of them should instead depend on a
+ * `DataFlow2::Configuration`, a `DataFlow3::Configuration`, or a
+ * `DataFlow4::Configuration`.
+ *
+ * See `semmle.code.cpp.dataflow.DataFlow` for the full documentation.
+ */
+
+ import cpp
+
+ /**
+  * DEPRECATED: Use `semmle.code.cpp.dataflow.new.DataFlow2` instead.
+  *
+  * Provides classes for performing local (intra-procedural) and
+  * global (inter-procedural) data flow analyses.
+  */
+ module DataFlow2 {
+   import semmle.code.cpp.dataflow.internal.DataFlowImpl2
+ }
\ No newline at end of file
diff --git a/cpp/ql/lib/semmle/code/cpp/temp/DataFlow3.qll b/cpp/ql/lib/semmle/code/cpp/temp/DataFlow3.qll
new file mode 100644
index 00000000000..662850e080e
--- /dev/null
+++ b/cpp/ql/lib/semmle/code/cpp/temp/DataFlow3.qll
@@ -0,0 +1,22 @@
+/**
+ * Provides a `DataFlow3` module, which is a copy of the `DataFlow` module. Use
+ * this class when data-flow configurations must depend on each other. Two
+ * classes extending `DataFlow::Configuration` should never depend on each
+ * other, but one of them should instead depend on a
+ * `DataFlow2::Configuration`, a `DataFlow3::Configuration`, or a
+ * `DataFlow4::Configuration`.
+ *
+ * See `semmle.code.cpp.dataflow.DataFlow` for the full documentation.
+ */
+
+ import cpp
+
+ /**
+  * DEPRECATED: Use `semmle.code.cpp.dataflow.new.DataFlow3` instead.
+  *
+  * Provides classes for performing local (intra-procedural) and
+  * global (inter-procedural) data flow analyses.
+  */
+ module DataFlow3 {
+   import semmle.code.cpp.dataflow.internal.DataFlowImpl3
+ }
\ No newline at end of file
diff --git a/cpp/ql/lib/semmle/code/cpp/temp/DataFlow4.qll b/cpp/ql/lib/semmle/code/cpp/temp/DataFlow4.qll
new file mode 100644
index 00000000000..0765577e7bd
--- /dev/null
+++ b/cpp/ql/lib/semmle/code/cpp/temp/DataFlow4.qll
@@ -0,0 +1,22 @@
+/**
+ * Provides a `DataFlow4` module, which is a copy of the `DataFlow` module. Use
+ * this class when data-flow configurations must depend on each other. Two
+ * classes extending `DataFlow::Configuration` should never depend on each
+ * other, but one of them should instead depend on a
+ * `DataFlow2::Configuration`, a `DataFlow3::Configuration`, or a
+ * `DataFlow4::Configuration`.
+ *
+ * See `semmle.code.cpp.dataflow.DataFlow` for the full documentation.
+ */
+
+ import cpp
+
+ /**
+  * DEPRECATED: Use `semmle.code.cpp.dataflow.new.DataFlow4` instead.
+  *
+  * Provides classes for performing local (intra-procedural) and
+  * global (inter-procedural) data flow analyses.
+  */
+ module DataFlow4 {
+   import semmle.code.cpp.dataflow.internal.DataFlowImpl4
+ }
\ No newline at end of file
diff --git a/cpp/ql/lib/semmle/code/cpp/temp/TaintTracking.qll b/cpp/ql/lib/semmle/code/cpp/temp/TaintTracking.qll
new file mode 100644
index 00000000000..86dbf71abe2
--- /dev/null
+++ b/cpp/ql/lib/semmle/code/cpp/temp/TaintTracking.qll
@@ -0,0 +1,30 @@
+/**
+ * Provides classes for performing local (intra-procedural) and
+ * global (inter-procedural) taint-tracking analyses.
+ *
+ * We define _taint propagation_ informally to mean that a substantial part of
+ * the information from the source is preserved at the sink. For example, taint
+ * propagates from `x` to `x + 100`, but it does not propagate from `x` to `x >
+ * 100` since we consider a single bit of information to be too little.
+ *
+ * To use global (interprocedural) taint tracking, extend the class
+ * `TaintTracking::Configuration` as documented on that class. To use local
+ * (intraprocedural) taint tracking between expressions, call
+ * `TaintTracking::localExprTaint`. For more general cases of local taint
+ * tracking, call `TaintTracking::localTaint` or
+ * `TaintTracking::localTaintStep` with arguments of type `DataFlow::Node`.
+ */
+
+ import semmle.code.cpp.temp.DataFlow
+ import semmle.code.cpp.temp.DataFlow2
+ 
+ /**
+  * DEPRECATED: Use `semmle.code.cpp.dataflow.new.TaintTracking` instead.
+  *
+  * Provides classes for performing local (intra-procedural) and
+  * global (inter-procedural) taint-tracking analyses.
+  */
+ module TaintTracking {
+   import semmle.code.cpp.dataflow.internal.tainttracking1.TaintTracking
+   import semmle.code.cpp.dataflow.internal.tainttracking1.TaintTrackingImpl
+ }
\ No newline at end of file
diff --git a/cpp/ql/lib/semmle/code/cpp/temp/TaintTracking2.qll b/cpp/ql/lib/semmle/code/cpp/temp/TaintTracking2.qll
new file mode 100644
index 00000000000..830827cecc5
--- /dev/null
+++ b/cpp/ql/lib/semmle/code/cpp/temp/TaintTracking2.qll
@@ -0,0 +1,22 @@
+/**
+ * Provides a `TaintTracking2` module, which is a copy of the `TaintTracking`
+ * module. Use this class when data-flow configurations or taint-tracking
+ * configurations must depend on each other. Two classes extending
+ * `DataFlow::Configuration` should never depend on each other, but one of them
+ * should instead depend on a `DataFlow2::Configuration`, a
+ * `DataFlow3::Configuration`, or a `DataFlow4::Configuration`. The
+ * `TaintTracking::Configuration` class extends `DataFlow::Configuration`, and
+ * `TaintTracking2::Configuration` extends `DataFlow2::Configuration`.
+ *
+ * See `semmle.code.cpp.dataflow.TaintTracking` for the full documentation.
+ */
+
+/**
+ * DEPRECATED: Use `semmle.code.cpp.dataflow.new.TaintTracking2` instead.
+ *
+ * Provides classes for performing local (intra-procedural) and
+ * global (inter-procedural) taint-tracking analyses.
+ */
+module TaintTracking2 {
+    import semmle.code.cpp.dataflow.internal.tainttracking2.TaintTrackingImpl
+}
\ No newline at end of file