diff --git a/unified/ql/lib/codeql/unified/internal/NameBindingPlugin.qll b/unified/ql/lib/codeql/unified/internal/NameBindingPlugin.qll
index 809172854b3a..b65ee16542fb 100644
--- a/unified/ql/lib/codeql/unified/internal/NameBindingPlugin.qll
+++ b/unified/ql/lib/codeql/unified/internal/NameBindingPlugin.qll
@@ -1,6 +1,9 @@
 private import unified
 private import codeql.util.Unit
-private import codeql.unified.internal.NameBindingPluginSwift // ensure overrides are seen
+
+private module Plugins {
+  private import codeql.unified.internal.NameBindingPluginSwift
+}
 
 /** Extension point for language-specific inputs to name binding. */
 class NameBindingPlugin extends Unit {
diff --git a/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowPlugin.qll b/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowPlugin.qll
index 7bf02b5a7524..01b480e5af74 100644
--- a/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowPlugin.qll
+++ b/unified/ql/lib/codeql/unified/internal/dataflow/DataFlowPlugin.qll
@@ -5,7 +5,10 @@
 private import unified
 private import AllDataFlow
 private import codeql.util.Unit
-private import DataFlowPluginSwift // ensure overrides are seen
+
+private module Plugins {
+  private import DataFlowPluginSwift
+}
 
 class DataFlowPlugin extends Unit {
   /** Holds if there is a language-specific step from `node1 -> step -> node2`. */