From 339a6215213781e28f09f22dab377bd2a8d6788e Mon Sep 17 00:00:00 2001
From: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Date: Tue, 6 Aug 2013 20:33:24 -0700
Subject: [PATCH] Bug 45203. TRansitively close header substitution maps before
 applying them.

---
 .../cdt/internal/ui/refactoring/includes/HeaderSubstitutor.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/HeaderSubstitutor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/HeaderSubstitutor.java
index d3016594ddb..30c6b9e9858 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/HeaderSubstitutor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/HeaderSubstitutor.java
@@ -53,6 +53,8 @@ public class HeaderSubstitutor {
 					fIncludeMaps[1].addAllMappings(map.getOptionalSubstitutionMap());
 				}
 			}
+			fIncludeMaps[0].transitivelyClose();
+			fIncludeMaps[1].transitivelyClose();
 		}
 
 		fSymbolExportMap = new SymbolExportMap();