diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index fea1dc39ffd..369bd5668f6 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -365,6 +365,22 @@
             type="text"
             extension="cxx">
       </fileTypes>
+      <fileTypes
+            type="text"
+            extension="C">
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="c++">
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="cp">
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="CPP">
+      </fileTypes>
       <fileTypes
             type="text"
             extension="h">
@@ -377,6 +393,26 @@
             type="text"
             extension="hpp">
       </fileTypes>
+      <fileTypes
+            type="text"
+            extension="hxx">
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="H">
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="HPP">
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="h++">
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="tcc">
+      </fileTypes>
       <fileTypes
             type="binary"
             extension="o">
@@ -508,12 +544,12 @@
 	  <!-- declares a content type for C++ source files -->
       <content-type id="cxxSource" name="%cxxSourceName" 
           base-type="org.eclipse.cdt.core.cSource"
-		  file-extensions="C,cpp,cxx,cc,c++"
+		  file-extensions="C,cpp,cxx,cc,c++,cp,CPP"
           priority="high"/>
 	  <!-- declares a content type for C++ header files -->
       <content-type id="cxxHeader" name="%cxxHeaderName" 
           base-type="org.eclipse.cdt.core.cxxSource"
-		  file-extensions="h,hpp,hh,hxx"          
+		  file-extensions="h,hpp,hh,hxx,H,HPP,h++,tcc"          
           priority="high"/>
 	  <!-- declares a content type for ASM Source files -->
       <content-type id="asmSource" name="%asmSourceName"