diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/Bound.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/Bound.qll
index c3dcc6525a4..4f03a735a69 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/Bound.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/Bound.qll
@@ -29,4 +29,6 @@ private module BoundDefs implements SharedBound::BoundDefinitions<CS::Location>
   predicate interestingExprBound(Expr e) { CU::systemArrayLengthAccess(e.getExpr()) }
 }
 
-import SharedBound::Bound<CS::Location, BoundDefs>
+module BoundImpl = SharedBound::Bound<CS::Location, BoundDefs>;
+
+import BoundImpl
diff --git a/java/ql/lib/semmle/code/java/dataflow/Bound.qll b/java/ql/lib/semmle/code/java/dataflow/Bound.qll
index df816ba6461..4780b9cacca 100644
--- a/java/ql/lib/semmle/code/java/dataflow/Bound.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/Bound.qll
@@ -31,4 +31,6 @@ private module BoundDefs implements SharedBound::BoundDefinitions<J::Location> {
   }
 }
 
-import SharedBound::Bound<J::Location, BoundDefs>
+module BoundImpl = SharedBound::Bound<J::Location, BoundDefs>;
+
+import BoundImpl