diff --git a/lib/rdoc/markup/block_quote.rb b/lib/rdoc/markup/block_quote.rb
index d2f13220f6..25a0a24140 100644
--- a/lib/rdoc/markup/block_quote.rb
+++ b/lib/rdoc/markup/block_quote.rb
@@ -1,14 +1,14 @@
 # frozen_string_literal: true
-##
-# A quoted section which contains markup items.
 
-class RDoc::Markup::BlockQuote < RDoc::Markup::Raw
-
-  ##
-  # Calls #accept_block_quote on +visitor+
-
-  def accept(visitor)
-    visitor.accept_block_quote self
+module RDoc
+  class Markup
+    class BlockQuote < Raw
+      # Calls #accept_block_quote on +visitor+
+      # @override
+      #: (untyped) -> void
+      def accept(visitor)
+        visitor.accept_block_quote(self)
+      end
+    end
   end
-
 end
diff --git a/lib/rdoc/markup/raw.rb b/lib/rdoc/markup/raw.rb
index 441a496ef5..5cb987fd31 100644
--- a/lib/rdoc/markup/raw.rb
+++ b/lib/rdoc/markup/raw.rb
@@ -3,7 +3,7 @@
 module RDoc
   class Markup
     # A section of text that is added to the output document as-is
-    class Raw
+    class Raw < Element
       # The component parts of the list
       #: Array[String]
       attr_reader :parts