diff --git a/include/Nazara/Shader/Ast/EliminateUnusedPassVisitor.hpp b/include/Nazara/Shader/Ast/EliminateUnusedPassVisitor.hpp
index db497d9b7..09443582d 100644
--- a/include/Nazara/Shader/Ast/EliminateUnusedPassVisitor.hpp
+++ b/include/Nazara/Shader/Ast/EliminateUnusedPassVisitor.hpp
@@ -32,13 +32,15 @@ namespace Nz::ShaderAst
 
 		private:
 			using AstCloner::Clone;
+			StatementPtr Clone(DeclareAliasStatement& node) override;
 			StatementPtr Clone(DeclareExternalStatement& node) override;
 			StatementPtr Clone(DeclareFunctionStatement& node) override;
 			StatementPtr Clone(DeclareStructStatement& node) override;
 			StatementPtr Clone(DeclareVariableStatement& node) override;
 
-			bool IsFunctionUsed(std::size_t varIndex) const;
-			bool IsStructUsed(std::size_t varIndex) const;
+			bool IsAliasUsed(std::size_t aliasIndex) const;
+			bool IsFunctionUsed(std::size_t funcIndex) const;
+			bool IsStructUsed(std::size_t structIndex) const;
 			bool IsVariableUsed(std::size_t varIndex) const;
 
 			struct Context;
diff --git a/src/Nazara/Shader/Ast/EliminateUnusedPassVisitor.cpp b/src/Nazara/Shader/Ast/EliminateUnusedPassVisitor.cpp
index 536f86150..657a30362 100644
--- a/src/Nazara/Shader/Ast/EliminateUnusedPassVisitor.cpp
+++ b/src/Nazara/Shader/Ast/EliminateUnusedPassVisitor.cpp
@@ -36,6 +36,15 @@ namespace Nz::ShaderAst
 		return Clone(statement);
 	}
 
+	StatementPtr EliminateUnusedPassVisitor::Clone(DeclareAliasStatement& node)
+	{
+		assert(node.aliasIndex);
+		if (!IsAliasUsed(*node.aliasIndex))
+			return ShaderBuilder::NoOp();
+
+		return AstCloner::Clone(node);
+	}
+
 	StatementPtr EliminateUnusedPassVisitor::Clone(DeclareExternalStatement& node)
 	{
 		bool isUsed = false;
@@ -99,16 +108,22 @@ namespace Nz::ShaderAst
 		return AstCloner::Clone(node);
 	}
 
-	bool EliminateUnusedPassVisitor::IsFunctionUsed(std::size_t varIndex) const
+	bool EliminateUnusedPassVisitor::IsAliasUsed(std::size_t aliasIndex) const
 	{
 		assert(m_context);
-		return m_context->usageSet.usedFunctions.UnboundedTest(varIndex);
+		return m_context->usageSet.usedAliases.UnboundedTest(aliasIndex);
 	}
 
-	bool EliminateUnusedPassVisitor::IsStructUsed(std::size_t varIndex) const
+	bool EliminateUnusedPassVisitor::IsFunctionUsed(std::size_t funcIndex) const
 	{
 		assert(m_context);
-		return m_context->usageSet.usedStructs.UnboundedTest(varIndex);
+		return m_context->usageSet.usedFunctions.UnboundedTest(funcIndex);
+	}
+
+	bool EliminateUnusedPassVisitor::IsStructUsed(std::size_t structIndex) const
+	{
+		assert(m_context);
+		return m_context->usageSet.usedStructs.UnboundedTest(structIndex);
 	}
 
 	bool EliminateUnusedPassVisitor::IsVariableUsed(std::size_t varIndex) const