diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 6a7cd40c7b0..a00f3d9c1ac 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -67,57 +67,57 @@
             pattern=".*">
       </filter>
       <filter
-            enabled="false"
-            name="%HideExecutableFiles.label"
             targetId="org.eclipse.cdt.ui.CView"
+            name="%HideExecutableFiles.label"
+            enabled="false"
             description="%HideExecutableFiles.description"
             class="org.eclipse.cdt.internal.ui.filters.ExecutableFilter"
             id="org.eclipse.cdt.internal.ui.CView.ExecutableFilter">
       </filter>
       <filter
-            enabled="false"
-            name="%HideSharedFiles.label"
             targetId="org.eclipse.cdt.ui.CView"
+            name="%HideSharedFiles.label"
+            enabled="false"
             description="%HideSharedFiles.description"
             class="org.eclipse.cdt.internal.ui.filters.SharedFilter"
             id="org.eclipse.cdt.internal.ui.CView.SharedFilter">
       </filter>
       <filter
-            enabled="false"
-            name="%HideObjectFiles.label"
             targetId="org.eclipse.cdt.ui.CView"
+            name="%HideObjectFiles.label"
+            enabled="false"
             description="%HideObjectFiles.description"
             class="org.eclipse.cdt.internal.ui.filters.ObjectFilter"
             id="org.eclipse.cdt.internal.ui.CView.ObjectFilter">
       </filter>
       <filter
-            enabled="false"
-            name="%HideArchiveFiles.label"
             targetId="org.eclipse.cdt.ui.CView"
+            name="%HideArchiveFiles.label"
+            enabled="false"
             description="%HideArchiveFiles.description"
             class="org.eclipse.cdt.internal.ui.filters.ArchiveFilter"
             id="org.eclipse.cdt.internal.ui.CView.ArchiveFilter">
       </filter>
       <filter
-            enabled="false"
-            name="%HideClosedProjects.label"
             targetId="org.eclipse.cdt.ui.CView"
+            name="%HideClosedProjects.label"
+            enabled="false"
             description="%HideClosedProjects.description"
             class="org.eclipse.cdt.internal.ui.filters.ClosedProjectFilter"
             id="org.eclipse.cdt.internal.ui.CView.ClosedProjectFilter">
       </filter>
       <filter
-            enabled="false"
-            name="%HideNonCProjects.label"
             targetId="org.eclipse.cdt.ui.CView"
+            name="%HideNonCProjects.label"
+            enabled="false"
             description="%HideNonCProjects.description"
             class="org.eclipse.cdt.internal.ui.filters.NonCProjectsFilter"
             id="org.eclipse.cdt.internal.ui.CView.NonCProjectsFilter">
       </filter>
       <filter
-            enabled="false"
-            name="%HideNonCElements.label"
             targetId="org.eclipse.cdt.ui.CView"
+            name="%HideNonCElements.label"
+            enabled="false"
             description="%HideNonCElements.description"
             class="org.eclipse.cdt.internal.ui.filters.NonCElementFilter"
             id="org.eclipse.cdt.internal.ui.CView.NonCElementFilter">
@@ -233,18 +233,18 @@
          id="org.eclipse.cdt.ui.ceditor"
          point="org.eclipse.ui.editors">
       <editor
-            name="%CEditor.name"
             default="true"
-            icon="icons/full/obj16/c_file_obj.gif"
+            name="%CEditor.name"
             extensions="c, cc, cpp, cxx, h, hh, hpp"
-            contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
+            icon="icons/full/obj16/c_file_obj.gif"
             class="org.eclipse.cdt.internal.ui.editor.CEditor"
+            contributorClass="org.eclipse.cdt.internal.ui.editor.CEditorActionContributor"
             id="org.eclipse.cdt.ui.editor.CEditor">
       </editor>
       <editor
             name="%AsmEditor.name"
-            icon="icons/full/obj16/s_file_obj.gif"
             extensions="s"
+            icon="icons/full/obj16/s_file_obj.gif"
             class="org.eclipse.cdt.internal.ui.editor.asm.AsmTextEditor"
             id="org.eclipse.cdt.ui.editor.asm.AsmEditor">
       </editor>
@@ -313,16 +313,16 @@
          <action
                label="%AddTask.label"
                helpContextId="org.eclipse.ui.AddTask_action_context"
-               tooltip="%AddTask.tooltip"
                class="org.eclipse.ui.texteditor.TaskRulerAction"
+               tooltip="%AddTask.tooltip"
                menubarPath="add"
                id="org.eclipse.ui.texteditor.TaskRulerAction">
          </action>
          <action
                label="%AddBookmark.label"
                helpContextId="org.eclipse.ui.bookmark_action_context"
-               tooltip="%AddBookmark.tooltip"
                class="org.eclipse.ui.texteditor.BookmarkRulerAction"
+               tooltip="%AddBookmark.tooltip"
                menubarPath="add"
                id="org.eclipse.ui.texteditor.BookmarkRulerAction">
          </action>
@@ -333,16 +333,16 @@
          <action
                label="%AddTask.label"
                helpContextId="org.eclipse.ui.AddTask_action_context"
-               tooltip="%AddTask.tooltip"
                class="org.eclipse.ui.texteditor.TaskRulerAction"
+               tooltip="%AddTask.tooltip"
                menubarPath="add"
                id="org.eclipse.ui.texteditor.TaskRulerAction">
          </action>
          <action
                label="%AddBookmark.label"
                helpContextId="org.eclipse.ui.bookmark_action_context"
-               tooltip="%AddBookmark.tooltip"
                class="org.eclipse.ui.texteditor.BookmarkRulerAction"
+               tooltip="%AddBookmark.tooltip"
                menubarPath="add"
                id="org.eclipse.ui.texteditor.BookmarkRulerAction">
          </action>
@@ -372,24 +372,24 @@
          <action
                label="%OpenNewFileWizardAction.label"
                icon="icons/full/ctool16/newfile_wiz.gif"
-               tooltip="%OpenNewFileWizardAction.tooltip"
                class="org.eclipse.cdt.internal.ui.wizards.OpenNewFileWizardAction"
+               tooltip="%OpenNewFileWizardAction.tooltip"
                toolbarPath="Normal/FolderWizards"
                id="org.eclipse.cdt.ui.actions.OpenNewFileWizardAction">
          </action>
          <action
                label="%OpenNewFolderWizardAction.label"
                icon="icons/full/ctool16/newfolder_wiz.gif"
-               tooltip="%OpenNewFolderWizardAction.tooltip"
                class="org.eclipse.cdt.internal.ui.wizards.OpenNewFolderWizardAction"
+               tooltip="%OpenNewFolderWizardAction.tooltip"
                toolbarPath="Normal/FolderWizards"
                id="org.eclipse.cdt.ui.actions.OpenNewFolderWizardAction">
          </action>
          <action
                label="%OpenClassWizardAction.label"
                icon="icons/full/ctool16/newclass_wiz.gif"
-               tooltip="%OpenClassWizardAction.tooltip"
                class="org.eclipse.cdt.ui.actions.OpenClassWizardAction"
+               tooltip="%OpenClassWizardAction.tooltip"
                toolbarPath="Normal/FolderWizards"
                id="org.eclipse.cdt.ui.actions.OpenClassWizardAction">
             <enablement>
@@ -430,8 +430,8 @@
       </category>
       <command
             name="%ActionDefinition.comment.name"
-            description="%ActionDefinition.comment.description"
             category="org.eclipse.cdt.ui.category.source"
+            description="%ActionDefinition.comment.description"
             id="org.eclipse.cdt.ui.edit.text.c.comment">
       </command>
       <keyBinding
@@ -442,8 +442,8 @@
       </keyBinding>
       <command
             name="%ActionDefinition.uncomment.name"
-            description="%ActionDefinition.uncomment.description"
             category="org.eclipse.cdt.ui.category.source"
+            description="%ActionDefinition.uncomment.description"
             id="org.eclipse.cdt.ui.edit.text.c.uncomment">
       </command>
       <keyBinding
@@ -454,8 +454,8 @@
       </keyBinding>
       <command
             name="%ActionDefinition.opendecl.name"
-            description="%ActionDefinition.opendecl.description"
             category="org.eclipse.cdt.ui.category.source"
+            description="%ActionDefinition.opendecl.description"
             id="org.eclipse.cdt.ui.edit.opendecl">
       </command>
       <keyBinding
@@ -466,8 +466,8 @@
       </keyBinding>
       <command
             name="%ActionDefinition.openType.name"
-            description="%ActionDefinition.openType.description"
             category="org.eclipse.cdt.ui.category.source"
+            description="%ActionDefinition.openType.description"
             id="org.eclipse.cdt.ui.navigate.opentype">
       </command>
       <keyBinding
@@ -478,8 +478,8 @@
       </keyBinding>
       <command
             name="%ActionDefinition.opencview.name"
-            category="org.eclipse.cdt.ui.category.source"
             description="%ActionDefinition.opencview.description"
+            category="org.eclipse.cdt.ui.category.source"
             id="org.eclipse.cdt.ui.edit.opencview">
       </command>
    </extension>
@@ -490,8 +490,8 @@
       <page
             showScopeSection="true"
             label="%CSearchPage.label"
-            icon="icons/full/obj16/csearch_obj.gif"
             extensions="c:90,cpp:90, cxx:90, cc:90,C:90, h:90, hh:90, hpp:90, H:90"
+            icon="icons/full/obj16/csearch_obj.gif"
             class="org.eclipse.cdt.internal.ui.search.CSearchPage"
             sizeHint="460, 160"
             id="org.eclipse.cdt.ui.CSearchPage">
@@ -503,24 +503,24 @@
             pageId="org.eclipse.cdt.ui.CSearchPage"
             label="%ElementNameSorter.label"
             icon="icons/full/clcl16/search_sortmatch.gif"
-            tooltip="%ElementNameSorter.tooltip"
             class="org.eclipse.cdt.internal.ui.search.ElementNameSorter"
+            tooltip="%ElementNameSorter.tooltip"
             id="org.eclipse.cdt.search.internal.ui.ElementNameSorter">
       </sorter>
       <sorter
             pageId="org.eclipse.cdt.ui.CSearchPage"
             label="%ParentNameSorter.label"
             icon="icons/full/clcl16/search_sortmatch.gif"
-            tooltip="%ParentNameSorter.tooltip"
             class="org.eclipse.cdt.internal.ui.search.ParentNameSorter"
+            tooltip="%ParentNameSorter.tooltip"
             id="org.eclipse.cdt.search.internal.ui.ParentNameSorter">
       </sorter>
       <sorter
             pageId="org.eclipse.cdt.ui.CSearchPage"
             label="%PathNameSorter.label"
             icon="icons/full/clcl16/search_sortmatch.gif"
-            tooltip="%PathNameSorter.tooltip"
             class="org.eclipse.cdt.internal.ui.search.PathNameSorter"
+            tooltip="%PathNameSorter.tooltip"
             id="org.eclipse.cdt.search.internal.ui.PathNameSorter">
       </sorter>
    </extension>
@@ -573,13 +573,13 @@
    <extension
          point="org.eclipse.cdt.ui.BinaryParserPage">
       <parserPage
-            parserID="org.eclipse.cdt.core.GNU_ELF"
             class="org.eclipse.cdt.ui.dialogs.GNUElfBinaryParserPage"
+            parserID="org.eclipse.cdt.core.GNU_ELF"
             id="ElfBinaryParserPage">
       </parserPage>
       <parserPage
-            parserID="org.eclipse.cdt.core.Cygwin_PE"
             class="org.eclipse.cdt.ui.dialogs.CygwinPEBinaryParserPage"
+            parserID="org.eclipse.cdt.core.Cygwin_PE"
             id="PEBinaryParserPage">
       </parserPage>
    </extension>
@@ -613,11 +613,11 @@
             contributesToHeader="false"
             overviewRulerPreferenceValue="false"
             presentationLayer="3"
-            symbolicIcon="warning"
             textStylePreferenceValue="NONE"
+            symbolicIcon="warning"
             icon="icons/full/obj16/unknown_obj.gif"
-            textPreferenceValue="false"
             label="Index Markers"
+            textPreferenceValue="false"
             textPreferenceKey="indexResultIndication"
             verticalRulerPreferenceKey="indexResultIndicationInVerticalRuler"
             overviewRulerPreferenceKey="indexResultIndicationInOverviewRuler">
@@ -650,10 +650,10 @@
    <extension
          point="org.eclipse.ui.propertyPages">
       <page
-            objectClass="org.eclipse.core.resources.IProject"
             adaptable="true"
+            objectClass="org.eclipse.core.resources.IProject"
             name="%CDTIndexerProperty.name"
-            class="org.eclipse.cdt.internal.ui.properties.IndexerOptionPropertyPage"
+            class="org.eclipse.cdt.ui.dialogs.IndexerOptionPropertyPage"
             id="org.eclipse.cdt.ui.indexer">
       </page>
    </extension>