5 files changed, 6 insertions, 6 deletions
diff --git a/source/core/slang-blob.h b/source/core/slang-blob.h
index e528f55a8..aa503a6e5 100644
--- a/source/core/slang-blob.h
+++ b/source/core/slang-blob.h
@@ -346,7 +346,7 @@ protected:
         m_scope(scope)
     {
         // Cache the ICastable interface if there is one.
-        blob->queryInterface(ICastable::getTypeGuid(), (void**)m_castable.writeRef());
+        blob->queryInterface(SLANG_IID_PPV_ARGS(m_castable.writeRef()));
     }
 
     ComPtr<ISlangUnknown> m_scope;
diff --git a/source/core/slang-castable-list-impl.cpp b/source/core/slang-castable-list-impl.cpp
index 1cc5dc2d4..4f4b07790 100644
--- a/source/core/slang-castable-list-impl.cpp
+++ b/source/core/slang-castable-list-impl.cpp
@@ -113,7 +113,7 @@ Index CastableList::indexOfUnknown(ISlangUnknown* unk)
     // If it has a castable interface we can just look for that
     {
         ComPtr<ICastable> castable;
-        if (SLANG_SUCCEEDED(unk->queryInterface(ICastable::getTypeGuid(), (void**)castable.writeRef())) && castable)
+        if (SLANG_SUCCEEDED(unk->queryInterface(SLANG_IID_PPV_ARGS(castable.writeRef()))) && castable)
         {
             return indexOf(castable);
         }
diff --git a/source/core/slang-castable-util.cpp b/source/core/slang-castable-util.cpp
index 408e36cb3..38652d47b 100644
--- a/source/core/slang-castable-util.cpp
+++ b/source/core/slang-castable-util.cpp
@@ -9,7 +9,7 @@ namespace Slang {
 {
     SLANG_ASSERT(unk);
     ComPtr<ICastable> castable;
-    if (SLANG_SUCCEEDED(unk->queryInterface(ICastable::getTypeGuid(), (void**)castable.writeRef())))
+    if (SLANG_SUCCEEDED(unk->queryInterface(SLANG_IID_PPV_ARGS(castable.writeRef()))))
     {
         SLANG_ASSERT(castable);
     }
diff --git a/source/core/slang-file-system.cpp b/source/core/slang-file-system.cpp
index 0369d0a02..db75e5365 100644
--- a/source/core/slang-file-system.cpp
+++ b/source/core/slang-file-system.cpp
@@ -338,7 +338,7 @@ void CacheFileSystem::setInnerFileSystem(ISlangFileSystem* fileSystem, UniqueIde
     if (fileSystem)
     {
         // Try to get the more sophisticated interface
-        fileSystem->queryInterface(ISlangFileSystemExt::getTypeGuid(), (void**)m_fileSystemExt.writeRef());
+        fileSystem->queryInterface(SLANG_IID_PPV_ARGS(m_fileSystemExt.writeRef()));
     }
 
     // Determine how paths map
@@ -826,7 +826,7 @@ RelativeFileSystem::RelativeFileSystem(ISlangFileSystem* fileSystem, const Strin
     m_osPathKind = OSPathKind::None;
 
     ComPtr<ISlangFileSystemExt> ext;
-    if (SLANG_SUCCEEDED(fileSystem->queryInterface(ISlangFileSystemExt::getTypeGuid(), (void**)ext.writeRef())))
+    if (SLANG_SUCCEEDED(fileSystem->queryInterface(SLANG_IID_PPV_ARGS(ext.writeRef()))))
     {
         m_osPathKind = ext->getOSPathKind();
 
diff --git a/source/core/slang-lazy-castable-list.cpp b/source/core/slang-lazy-castable-list.cpp
index 1832a67f4..112172108 100644
--- a/source/core/slang-lazy-castable-list.cpp
+++ b/source/core/slang-lazy-castable-list.cpp
@@ -150,7 +150,7 @@ Index LazyCastableList::indexOfUnknown(ISlangUnknown* unk) const
     // Try as a ICastable first
     {
         ComPtr<ICastable> castable;
-        if (SLANG_SUCCEEDED(unk->queryInterface(ICastable::getTypeGuid(), (void**)castable.writeRef())) && castable)
+        if (SLANG_SUCCEEDED(unk->queryInterface(SLANG_IID_PPV_ARGS(castable.writeRef()))) && castable)
         {
             return indexOf(castable);
         }