diff --git a/core/org.eclipse.cdt.core/plugin.properties b/core/org.eclipse.cdt.core/plugin.properties
index 40e3064f0cf..b94cb646bd5 100644
--- a/core/org.eclipse.cdt.core/plugin.properties
+++ b/core/org.eclipse.cdt.core/plugin.properties
@@ -10,6 +10,7 @@ CBuildConsole.name=C Builder Console
 CProject.name=C Project
 CBuilder.name=C Build Model
 ProcessList.name=Process List
+ErrorParser.name=Error Parser
 
 makeproject.name=Make Project
 genericmake.name=Generic Make
diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index 88526a69002..63fc803a32e 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -21,12 +21,48 @@
    </requires>
 
 
-   <extension-point id="CBuildCommand" name="%CBuildCommand.name"/>
-   <extension-point id="CBuildConsole" name="%CBuildConsole.name"/>
    <extension-point id="CProject" name="%CProject.name"/>
+
+<!-- =================================================================================== -->
+<!-- Extension Point:(Deprecated, to be removed)                                         -->
+<!-- =================================================================================== -->
+
    <extension-point id="CBuildModel" name="%CBuilder.name"/>
+
+<!-- =================================================================================== -->
+<!-- Extension Point:(Deprecated, to be removed) Default command for the MakeBuilder     -->
+<!-- =================================================================================== -->
+
+   <extension-point id="CBuildCommand" name="%CBuildCommand.name"/>
+
+<!-- =================================================================================== -->
+<!-- Extension Point:(work in progress) IConsole, customize a C Build console output     -->
+<!-- =================================================================================== -->
+
+   <extension-point id="CBuildConsole" name="%CBuildConsole.name"/>
+
+<!-- =================================================================================== -->
+<!-- Extension Point: IProcessList, returns a list of running processes                  -->
+<!-- =================================================================================== -->
+
    <extension-point id="ProcessList" name="%ProcessList.name" schema="schema/ProcessList.exsd"/>
+
+<!-- =================================================================================== -->
+<!-- Extension Point: IErrorParser, error parsers use when building                      -->
+<!-- =================================================================================== -->
+
+   <extension-point id="ErrorParser" name="%ErrorParser.name"/>
+
+<!-- =================================================================================== -->
+<!-- Extension Point: IBinaryParser, use to detect wheter an IFile is a binary           -->
+<!-- =================================================================================== -->
+
    <extension-point id="BinaryParser" name="BinaryParser"/>
+
+<!-- =================================================================================== -->
+<!-- Extension Point: ????????????????                                                   -->
+<!-- =================================================================================== -->
+
    <extension-point id="CToolchain" name="C/C++ Toolchain Provider" schema="schema/CToolchain.exsd"/>
    <extension-point id="CBuildConfiguration" name="C/C++ Build Configuration" schema="schema/CBuildConfiguration.exsd"/>
    <extension-point id="CTool" name="C/C++ Tool" schema="schema/CTool.exsd"/>
@@ -35,6 +71,11 @@
    <extension-point id="ManagedBuildInfo" name="Managed Build Tools" schema="schema/ManagedBuildTools.exsd"/>
    <extension-point id="ScannerInfoProvider" name="Scanner Information Provider"/>
 
+
+<!-- =================================================================================== -->
+<!-- Extension Point: ????????????????                                                   -->
+<!-- =================================================================================== -->
+
    <extension
          point="org.eclipse.cdt.core.CToolType">
       <type
@@ -74,7 +115,10 @@
             id="org.eclipse.cdt.core.tool.strip">
       </type>
    </extension>
-<!-- Define the list of the Binary Parser provided by the CDT -->
+
+<!-- =================================================================================== -->
+<!-- Define the list of the Binary Parser provided by the CDT                            -->
+<!-- =================================================================================== -->
    <extension
          id="ELF"
          name="Elf Parser"
@@ -95,6 +139,59 @@
          </run>
       </cextension>
    </extension>
+
+<!-- =================================================================================== -->
+<!-- Define the list of Error Parser provided by the CDT                                 -->
+<!-- =================================================================================== -->
+   <extension
+         id="GCCErrorParser"
+         name="CDT GNU C/C++ Error Parser"
+         point="org.eclipse.cdt.core.ErrorParser">
+      <errorparser
+            class="org.eclipse.cdt.internal.errorparsers.GCCErrorParser">
+      </errorparser>
+   </extension>
+
+   <extension
+         id="GASErrorParser"
+         name="CDT GNU Assembler Error Parser"
+         point="org.eclipse.cdt.core.ErrorParser">
+      <errorparser
+            class="org.eclipse.cdt.internal.errorparsers.GASErrorParser">
+      </errorparser>
+   </extension>
+
+   <extension
+         id="GLDErrorParser"
+         name="CDT GNU Linker Error Parser"
+         point="org.eclipse.cdt.core.ErrorParser">
+      <errorparser
+            class="org.eclipse.cdt.internal.errorparsers.GLDErrorParser">
+      </errorparser>
+   </extension>
+
+   <extension
+         id="MakeErrorParser"
+         name="CDT GNU Make Error Parser"
+         point="org.eclipse.cdt.core.ErrorParser">
+      <errorparser
+            class="org.eclipse.cdt.internal.errorparsers.MakeErrorParser">
+      </errorparser>
+   </extension>
+
+   <extension
+         id="VCErrorParser"
+         name="CDT Visual C Error Parser"
+         point="org.eclipse.cdt.core.ErrorParser">
+      <errorparser
+            class="org.eclipse.cdt.internal.core.linux.VCErrorParser">
+      </errorparser>
+   </extension>
+
+<!-- =================================================================================== -->
+<!-- Eclipse Builder provided by the CDT, to be removed to the MakePlugin                -->
+<!-- =================================================================================== -->
+
    <extension
          id="cbuilder"
          name="C Builder"
@@ -105,6 +202,11 @@
          </run>
       </builder>
    </extension>
+
+<!-- =================================================================================== -->
+<!-- Extension Point: ????????????????                                                   -->
+<!-- =================================================================================== -->
+
    <extension
          id="newcbuilder"
          name="C Builder"
@@ -115,6 +217,11 @@
          </run>
       </builder>
    </extension>
+
+<!-- =================================================================================== -->
+<!-- Extension Point: ????????????????                                                   -->
+<!-- =================================================================================== -->
+
    <extension
          id="genmakebuilder"
          name="%GeneratedMakefileCBuilder.name"
@@ -126,6 +233,11 @@
          </run>
       </builder>
    </extension>
+
+<!-- =================================================================================== -->
+<!-- CDT customized problem markers: C Problem markers                                   -->
+<!-- =================================================================================== -->
+
    <extension
          id="problem"
          name="%CProblemMarker.name"
@@ -137,6 +249,11 @@
             type="org.eclipse.core.resources.textmarker">
       </super>
    </extension>
+
+<!-- =================================================================================== -->
+<!-- CDT C Nature                                                                        -->
+<!-- =================================================================================== -->
+
    <extension
          id="cnature"
          name="%cnature.name"
@@ -147,6 +264,11 @@
          </run>
       </runtime>
    </extension>
+
+<!-- =================================================================================== -->
+<!-- CDT C++ Nature                                                                      -->
+<!-- =================================================================================== -->
+
    <extension
          id="ccnature"
          name="%cnature.name"
@@ -157,6 +279,11 @@
          </run>
       </runtime>
    </extension>
+
+<!-- =================================================================================== -->
+<!-- Extension Point: ????????????????                                                   -->
+<!-- =================================================================================== -->
+
    <extension
          id="managedBuildNature"
          name="%ManagedBuildNature.name"
@@ -173,12 +300,22 @@
             id="org.eclipse.cdt.core.genmakebuilder">
       </builder>
    </extension>
+
+<!-- =================================================================================== -->
+<!-- Deprecated Make default command, will be removed.                                   -->
+<!-- =================================================================================== -->
+
    <extension
          point="org.eclipse.cdt.core.CBuildCommand">
       <buildcommand
             command="make">
       </buildcommand>
    </extension>
+
+<!-- =================================================================================== -->
+<!-- Deprecated Make owner, will be removed.                                             -->
+<!-- =================================================================================== -->
+
    <extension
          id="make"
          name="%makeproject.name"
@@ -187,6 +324,11 @@
             class="org.eclipse.cdt.internal.core.make.MakeProject">
       </cproject>
    </extension>
+
+<!-- =================================================================================== -->
+<!-- Deprecated Make builder, will be removed.                                           -->
+<!-- =================================================================================== -->
+
    <extension
          id="makeBuilder"
          name="%makebuildmodel.name"
@@ -195,9 +337,11 @@
             class="org.eclipse.cdt.internal.core.make.MakeBuilder">
       </run>
    </extension>
-<!-- ================================================== -->
-<!-- Some well known C file extensions                  -->
-<!-- ================================================== -->
+
+<!-- =================================================================================== -->
+<!-- Some well known C file extensions override for the team plugins                     -->
+<!-- =================================================================================== -->
+
    <extension
          point="org.eclipse.team.core.fileTypes">
       <fileTypes
@@ -253,6 +397,11 @@
             extension=".cdtproject">
       </fileTypes>
    </extension>
+
+<!-- =================================================================================== -->
+<!-- Some well known C file extensions override for the team plugins                     -->
+<!-- =================================================================================== -->
+
    <extension
          point="org.eclipse.team.core.ignore">
       <ignore
@@ -280,6 +429,11 @@
             pattern="*.exe">
       </ignore>
    </extension>
+
+<!-- =================================================================================== -->
+<!-- Extension Point(Note:Temporary): IScannerInfoProvider for the managed Builder       -->
+<!-- =================================================================================== -->
+
    <extension
          id="ManagedBuildManager"
          point="org.eclipse.cdt.core.ScannerInfoProvider">
@@ -290,6 +444,10 @@
       </cextension>
    </extension>
 
+<!-- =================================================================================== -->
+<!-- Extension Point(Note:Temporary): IScannerInfoProvider for the standard Builder      -->
+<!-- =================================================================================== -->
+
    <extension
          id="StandardBuildManager"
          point="org.eclipse.cdt.core.ScannerInfoProvider">
@@ -299,6 +457,10 @@
          </run>
       </cextension>
    </extension>
+
+<!-- =================================================================================== -->
+<!-- =================================================================================== -->
+
     <extension id="task" name="%CTaskName" point="org.eclipse.core.resources.markers">
         <super type="org.eclipse.core.resources.taskmarker"/> 
         <persistent value="true"/>