diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index add6cb4f9a6..81354a3bcb3 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -536,7 +536,7 @@
           priority="high"/>
    </extension>
 
-   <!-- The reserved filenames by the C++ standard (cinttypes is G++ specific) -->
+   <!-- The reserved filenames by the C++ standard -->
    <extension point="org.eclipse.core.contenttype.contentTypes"> 
       <file-association 
        content-type="org.eclipse.cdt.core.cxxHeader"
@@ -575,7 +575,7 @@
    <extension point="org.eclipse.core.contenttype.contentTypes"> 
       <file-association 
        content-type="org.eclipse.cdt.core.cxxHeader"
-       file-names="condition_variable,ctgmath"/>
+       file-names="condition_variable,ctgmath,cuchar,scoped_allocator,cstdalign,shared_mutex"/>
    </extension> 
  
 <!-- =================================================================================== -->
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/GCCHeaderSubstitutionMaps.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/GCCHeaderSubstitutionMaps.java
index 4ca602dcad4..4291daa4400 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/GCCHeaderSubstitutionMaps.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/includes/GCCHeaderSubstitutionMaps.java
@@ -454,6 +454,7 @@ public class GCCHeaderSubstitutionMaps {
 			"<math.h>", "<cmath>",
 			"<setjmp.h>", "<csetjmp>",
 			"<signal.h>", "<csignal>",
+			"<stdalign.h", "<cstdalign>",
 			"<stdarg.h>", "<cstdarg>",
 			"<stdbool.h>", "<cstdbool>",
 			"<stddef.h>", "<cstddef>",
@@ -463,6 +464,7 @@ public class GCCHeaderSubstitutionMaps {
 			"<string.h>", "<cstring>",
 			"<tgmath.h>", "<ctgmath>",
 			"<time.h>", "<ctime>",
+			"<uchar.h>", "<cuchar>",
 			"<wchar.h>", "<cwchar>",
 			"<wctype.h>", "<cwctype>",
 			"<ios>", "<iostream>",