diff --git a/ql/src/codeql_ruby/ast/Method.qll b/ql/src/codeql_ruby/ast/Method.qll
index bf284ea29f8..a3b15175704 100644
--- a/ql/src/codeql_ruby/ast/Method.qll
+++ b/ql/src/codeql_ruby/ast/Method.qll
@@ -1,4 +1,4 @@
-import codeql_ruby.AST
+private import codeql_ruby.AST
 private import internal.TreeSitter
 private import internal.Method
 
diff --git a/ql/src/codeql_ruby/ast/Parameter.qll b/ql/src/codeql_ruby/ast/Parameter.qll
index a9c3587c523..aa0cb5eca5f 100644
--- a/ql/src/codeql_ruby/ast/Parameter.qll
+++ b/ql/src/codeql_ruby/ast/Parameter.qll
@@ -1,4 +1,4 @@
-import codeql_ruby.AST
+private import codeql_ruby.AST
 private import internal.Pattern
 private import internal.TreeSitter
 private import internal.Variable
diff --git a/ql/src/codeql_ruby/ast/Pattern.qll b/ql/src/codeql_ruby/ast/Pattern.qll
index 093cb665740..cc90d18ef24 100644
--- a/ql/src/codeql_ruby/ast/Pattern.qll
+++ b/ql/src/codeql_ruby/ast/Pattern.qll
@@ -1,9 +1,8 @@
-import codeql_ruby.AST
+private import codeql_ruby.AST
 private import codeql.Locations
 private import internal.Pattern
 private import internal.TreeSitter
 private import internal.Variable
-private import Variable
 
 /** A pattern. */
 class Pattern extends AstNode {
diff --git a/ql/src/codeql_ruby/ast/Variable.qll b/ql/src/codeql_ruby/ast/Variable.qll
index 6e56ab83c1b..7c590f0613d 100644
--- a/ql/src/codeql_ruby/ast/Variable.qll
+++ b/ql/src/codeql_ruby/ast/Variable.qll
@@ -1,6 +1,6 @@
 /** Provides classes for modeling program variables. */
 
-import codeql_ruby.AST
+private import codeql_ruby.AST
 private import codeql.Locations
 private import internal.TreeSitter
 private import internal.Variable
diff --git a/ql/src/codeql_ruby/ast/internal/Method.qll b/ql/src/codeql_ruby/ast/internal/Method.qll
index 577e1ebdcf0..9555dd5d337 100644
--- a/ql/src/codeql_ruby/ast/internal/Method.qll
+++ b/ql/src/codeql_ruby/ast/internal/Method.qll
@@ -1,4 +1,4 @@
-import codeql_ruby.AST
+private import codeql_ruby.AST
 private import TreeSitter
 
 module Callable {
diff --git a/ql/src/codeql_ruby/ast/internal/Pattern.qll b/ql/src/codeql_ruby/ast/internal/Pattern.qll
index 5f55dd9c664..1b097f61b5e 100644
--- a/ql/src/codeql_ruby/ast/internal/Pattern.qll
+++ b/ql/src/codeql_ruby/ast/internal/Pattern.qll
@@ -1,6 +1,6 @@
-import codeql_ruby.AST
+private import codeql_ruby.AST
 private import TreeSitter
-private import Variable
+private import codeql_ruby.ast.internal.Variable
 private import codeql.Locations
 
 private predicate tuplePatternNode(Generated::AstNode n, boolean parameter) {
diff --git a/ql/src/codeql_ruby/ast/internal/Variable.qll b/ql/src/codeql_ruby/ast/internal/Variable.qll
index a6d89adda95..cdb58383e79 100644
--- a/ql/src/codeql_ruby/ast/internal/Variable.qll
+++ b/ql/src/codeql_ruby/ast/internal/Variable.qll
@@ -1,7 +1,7 @@
-import codeql_ruby.AST
+private import codeql_ruby.AST
 private import TreeSitter
 private import codeql.Locations
-private import Pattern
+private import codeql_ruby.ast.internal.Pattern
 
 private Generated::AstNode parent(Generated::AstNode n) {
   result = n.getParent() and
diff --git a/ql/test/library-tests/variables/parameter.ql b/ql/test/library-tests/variables/parameter.ql
index 5145fe1f508..c45090c4efa 100644
--- a/ql/test/library-tests/variables/parameter.ql
+++ b/ql/test/library-tests/variables/parameter.ql
@@ -1,4 +1,5 @@
 import codeql_ruby.ast.Variable
+import codeql_ruby.ast.Parameter
 
 query predicate parameterVariable(Parameter p, Variable v) { v = p.getAVariable() }