diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
index f08cadd2eb2..c7c16305204 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties
@@ -457,7 +457,7 @@ IncludeOrderBlock_down= D&own
 IncludeOrderBlock_order_of_includes= O&rder of Include Statements:
 
 IncludePragmasPreferencePage_title= Include Pragmas
-IncludePragmasBlock_description=Include pragmas are special comments that affect behavior of Organize Includes command. A description of include pragmas can be found at <a href="https://code.google.com/p/include-what-you-use/wiki/IWYUPragmas">IWYU Pragmas</a>. Include patterns can be customized by defining regular expressions matching each of the pragmas. 
+IncludePragmasBlock_description=Include pragmas are special comments that affect behavior of Organize Includes command. A description of include pragmas can be found in <a href="https://code.google.com/p/include-what-you-use/wiki/IWYUPragmas">IWYU Pragmas</a>. Include patterns can be customized by defining regular expressions matching each of the pragmas. 
 IncludePragmasBlock_link_tooltip=Wiki page describing include-what-you-use pragmas
 IncludePragmasBlock_export_pattern= Export:
 IncludePragmasBlock_begin_exports_pattern= Begin Exports:
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 2957ecc0d82..251c85d426b 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
@@ -474,6 +474,7 @@ public class HeaderSubstitutor {
 			"<ios>", "<iostream>",
 			"<ios>", "<istream>",
 			"<ios>", "<ostream>",
+			"<iosfwd>", "<iostream>",  // TODO(sprigogin): This should already be covered by <ios> -> <iostream> mapping
 			"<iosfwd>", "<ios>",
 			"<iosfwd>", "<streambuf>",
 			"<istream>", "<iostream>",