diff --git a/cpp/ql/src/filters/ImportAdditionalLibraries.ql b/cpp/ql/src/filters/ImportAdditionalLibraries.ql
index ca4b9856585f..746b376f1dd2 100644
--- a/cpp/ql/src/filters/ImportAdditionalLibraries.ql
+++ b/cpp/ql/src/filters/ImportAdditionalLibraries.ql
@@ -9,15 +9,21 @@
 
 import cpp
 
-import semmle.code.cpp.dataflow.DataFlow
-import semmle.code.cpp.dataflow.DataFlow2
-import semmle.code.cpp.dataflow.DataFlow3
-import semmle.code.cpp.dataflow.DataFlow4
-import semmle.code.cpp.dataflow.TaintTracking
-import semmle.code.cpp.ir.dataflow.DataFlow
-import semmle.code.cpp.ir.dataflow.DataFlow2
-import semmle.code.cpp.ir.dataflow.DataFlow3
-import semmle.code.cpp.ir.dataflow.DataFlow4
+module ASTDataFlow {
+  import semmle.code.cpp.dataflow.DataFlow
+  import semmle.code.cpp.dataflow.DataFlow2
+  import semmle.code.cpp.dataflow.DataFlow3
+  import semmle.code.cpp.dataflow.DataFlow4
+  import semmle.code.cpp.dataflow.TaintTracking
+}
+
+module IRDataFlow {
+  import semmle.code.cpp.ir.dataflow.DataFlow
+  import semmle.code.cpp.ir.dataflow.DataFlow2
+  import semmle.code.cpp.ir.dataflow.DataFlow3
+  import semmle.code.cpp.ir.dataflow.DataFlow4
+}
+
 import semmle.code.cpp.valuenumbering.HashCons
 
 from File f, string tag