diff --git a/tools/tidy/include/TidyFactory.h b/tools/tidy/include/TidyFactory.h
index f0fca8793..79ce942ad 100644
--- a/tools/tidy/include/TidyFactory.h
+++ b/tools/tidy/include/TidyFactory.h
@@ -21,7 +21,7 @@
 
 class TidyCheck;
 
-class Registry {
+class SLANG_EXPORT Registry {
 public:
     using RegistryFunction = std::function<std::unique_ptr<TidyCheck>()>;
     struct RegistryValue {
@@ -69,11 +69,11 @@ class Registry {
     static const TidyConfig& getConfig() { return config(); }
 
     static void setSourceManager(const slang::SourceManager* sm) { *sourceManager() = sm; }
-    static const slang::SourceManager* getSourceManager() {
+    static slang::not_null<const slang::SourceManager*> getSourceManager() {
         if (auto sm = *sourceManager(); sm == nullptr)
             SLANG_THROW(std::runtime_error("TidyFactory: Trying to get SourceManager, but factory "
                                            "pointer has not been initialized"));
-        return *sourceManager();
+        return slang::not_null<const slang::SourceManager*>(*sourceManager());
     }
 
 private: