diff --git a/Library/Homebrew/os/linux.rb b/Library/Homebrew/os/linux.rb
index c035191168..aed872fce4 100644
--- a/Library/Homebrew/os/linux.rb
+++ b/Library/Homebrew/os/linux.rb
@@ -27,7 +27,7 @@ module OS
 
     # rubocop:disable Naming/ConstantName
     # rubocop:disable Style/MutableConstant
-    ::MacOS = self
+    ::MacOS = OS::Mac
     # rubocop:enable Naming/ConstantName
     # rubocop:enable Style/MutableConstant
 
diff --git a/Library/Homebrew/os/mac.rb b/Library/Homebrew/os/mac.rb
index 4e77f0cf25..654f2d5c04 100644
--- a/Library/Homebrew/os/mac.rb
+++ b/Library/Homebrew/os/mac.rb
@@ -12,7 +12,7 @@ module OS
 
     # rubocop:disable Naming/ConstantName
     # rubocop:disable Style/MutableConstant
-    ::MacOS = self
+    ::MacOS = OS::Mac
     # rubocop:enable Naming/ConstantName
     # rubocop:enable Style/MutableConstant
 
diff --git a/Library/Homebrew/sorbet/rbi/todo.rbi b/Library/Homebrew/sorbet/rbi/todo.rbi
index d48bed4922..99d305e153 100644
--- a/Library/Homebrew/sorbet/rbi/todo.rbi
+++ b/Library/Homebrew/sorbet/rbi/todo.rbi
@@ -7,13 +7,6 @@ module ELFShim::Metadata::PatchELF::PatchError; end
 module ELFShim::PatchELF::PatchError; end
 module ELFShim::PatchELF::Patcher; end
 module Homebrew::Error; end
-module MacOS::CLT; end
-module MacOS::CLT::PKG_PATH; end
-module MacOS::Version; end
-module MacOS::Version::SYMBOLS; end
-module MacOS::X11; end
-module MacOS::XQuartz; end
-module MacOS::Xcode; end
 module OS::Mac::Version::NULL; end
 module T::CompatibilityPatches::RSpecCompatibility::MethodDoubleExtensions; end
 module T::CompatibilityPatches::RSpecCompatibility::RecorderExtensions; end