5 files changed, 5 insertions, 5 deletions
diff --git a/lib/rdoc/context.rb b/lib/rdoc/context.rb
index 8e15697034..c6edfb473c 100644
--- a/lib/rdoc/context.rb
+++ b/lib/rdoc/context.rb
@@ -1,6 +1,4 @@
 # frozen_string_literal: true
-require 'cgi'
-
 ##
 # A Context is something that can hold modules, classes, methods, attributes,
 # aliases, requires, and includes. Classes, modules, and files are all
diff --git a/lib/rdoc/context/section.rb b/lib/rdoc/context/section.rb
index 5fef4a9ffc..c316efe99f 100644
--- a/lib/rdoc/context/section.rb
+++ b/lib/rdoc/context/section.rb
@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+require 'cgi/util'
+
 ##
 # A section of documentation like:
 #
diff --git a/lib/rdoc/markup/to_html.rb b/lib/rdoc/markup/to_html.rb
index d3bb8af835..7c2e91cecf 100644
--- a/lib/rdoc/markup/to_html.rb
+++ b/lib/rdoc/markup/to_html.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'cgi'
+require 'cgi/util'
 
 ##
 # Outputs RDoc markup as HTML.
diff --git a/lib/rdoc/markup/to_label.rb b/lib/rdoc/markup/to_label.rb
index 3d95ccc2e2..aa1dbcf2a1 100644
--- a/lib/rdoc/markup/to_label.rb
+++ b/lib/rdoc/markup/to_label.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'cgi'
+require 'cgi/util'
 
 ##
 # Creates HTML-safe labels suitable for use in id attributes.  Tidylinks are
diff --git a/lib/rdoc/method_attr.rb b/lib/rdoc/method_attr.rb
index 3cef78c4a5..aae3c47e85 100644
--- a/lib/rdoc/method_attr.rb
+++ b/lib/rdoc/method_attr.rb
@@ -289,7 +289,7 @@ class RDoc::MethodAttr < RDoc::CodeObject
   # HTML id-friendly method/attribute name
 
   def html_name
-    require 'cgi'
+    require 'cgi/util'
 
     CGI.escape(@name.gsub('-', '-2D')).gsub('%','-').sub(/^-/, '')
   end