diff --git a/core/org.eclipse.cdt.core/schema/PDOMASTProcessor.exsd b/core/org.eclipse.cdt.core/schema/PDOMASTProcessor.exsd
index 77c88a53cca..fb087747692 100644
--- a/core/org.eclipse.cdt.core/schema/PDOMASTProcessor.exsd
+++ b/core/org.eclipse.cdt.core/schema/PDOMASTProcessor.exsd
@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
 <schema targetNamespace="org.eclipse.cdt.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
-
 <annotation>
       <appInfo>
          <meta.schema plugin="org.eclipse.cdt.core" id="PDOMASTProcessor" name="PDOM AST Processor"/>
diff --git a/core/org.eclipse.cdt.core/schema/ProblemMarkerFilter.exsd b/core/org.eclipse.cdt.core/schema/ProblemMarkerFilter.exsd
index 2a6daa7bf82..a26135d962d 100644
--- a/core/org.eclipse.cdt.core/schema/ProblemMarkerFilter.exsd
+++ b/core/org.eclipse.cdt.core/schema/ProblemMarkerFilter.exsd
@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
 <schema targetNamespace="org.eclipse.cdt.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
-
 <annotation>
       <appInfo>
          <meta.schema plugin="org.eclipse.cdt.core" id="ProblemMarkerFilter" name="Problem Marker Filter"/>
@@ -11,9 +9,9 @@
          This extension point allows to filter out unneeded problem markers. 
          For example during building of Qt base project with QML files tool Qt Linguist
          could report syntax errors in some qml file. These errors are presented as 
-         "C/C++ Problems" in qml files because they match format CDT expects for errors.
+         &quot;C/C++ Problems&quot; in qml files because they match format CDT expects for errors.
          If there is already installed plug-in that handles QML files it is a wise to ignore such
-         errors because they are already reported as "QML Problems" with more meaningful descriptions.
+         errors because they are already reported as &quot;QML Problems&quot; with more meaningful descriptions.
       </documentation>
    </annotation>
 
@@ -55,7 +53,7 @@
          </attribute>
       </complexType>
    </element>
-   
+
    <element name="problemMarkerFilter">
       <complexType>
          <sequence>
@@ -66,9 +64,9 @@
                <documentation>
                   Implementation of Problem Marker Filter that allows to filter out unneded or duplicit problem markers.
                </documentation>
-               <appinfo>
+               <appInfo>
                   <meta.attribute kind="java" basedOn=":org.eclipse.cdt.core.IProblemMarkerFilter"/>
-               </appinfo>
+               </appInfo>
             </annotation>
          </attribute>
       </complexType>
@@ -88,7 +86,7 @@
          <meta.section type="examples"/>
       </appInfo>
       <documentation>
-	          The following is an example of a qmakeEnvProvider contribution:
+         The following is an example of a qmakeEnvProvider contribution:
 &lt;p&gt;
 &lt;pre&gt;
 &lt;extension
@@ -116,7 +114,7 @@
          <meta.section type="apiinfo"/>
       </appInfo>
       <documentation>
-        The contributed class must implement &lt;code&gt;org.eclipse.cdt.core.IProblemMarkerFilter&lt;/code&gt;.
+         The contributed class must implement &lt;code&gt;org.eclipse.cdt.core.IProblemMarkerFilter&lt;/code&gt;.
       </documentation>
    </annotation>
 
@@ -125,7 +123,7 @@
          <meta.section type="implementation"/>
       </appInfo>
       <documentation>
-          Copyright (c) 2014 BlackBerry Limited and others.
+         Copyright (c) 2014 BlackBerry Limited and others.
           All rights reserved. This program and the accompanying materials
           are made available under the terms of the Eclipse Public License v1.0
           which accompanies this distribution, and is available at
diff --git a/core/org.eclipse.cdt.ui/schema/quickAssistProcessors.exsd b/core/org.eclipse.cdt.ui/schema/quickAssistProcessors.exsd
index c703c003627..11d86c76647 100644
--- a/core/org.eclipse.cdt.ui/schema/quickAssistProcessors.exsd
+++ b/core/org.eclipse.cdt.ui/schema/quickAssistProcessors.exsd
@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
 <schema targetNamespace="org.eclipse.cdt.ui" xmlns="http://www.w3.org/2001/XMLSchema">
-<include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
-
 <annotation>
       <appInfo>
          <meta.schema plugin="org.eclipse.cdt.ui" id="quickAssistProcessors" name="Quick Assist Processor"/>
@@ -16,7 +14,9 @@ This extension point supports the &lt;code&gt;enablement&lt;/code&gt; tag. Prope
 &lt;/dl&gt;
       </documentation>
    </annotation>
+
    <include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
+
    <element name="extension">
       <annotation>
          <appInfo>
@@ -53,6 +53,7 @@ This extension point supports the &lt;code&gt;enablement&lt;/code&gt; tag. Prope
          </attribute>
       </complexType>
    </element>
+
    <element name="quickAssistProcessor">
       <complexType>
          <sequence>
@@ -97,14 +98,7 @@ with a public 0-argument constructor.
          </attribute>
       </complexType>
    </element>
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The contributed class must implement &lt;code&gt;org.eclipse.cdt.ui.text.IQuickAssistProcessor&lt;/code&gt;
-      </documentation>
-   </annotation>
+
    <annotation>
       <appInfo>
          <meta.section type="since"/>
@@ -113,6 +107,7 @@ with a public 0-argument constructor.
          5.1
       </documentation>
    </annotation>
+
    <annotation>
       <appInfo>
          <meta.section type="examples"/>
@@ -140,6 +135,17 @@ with a public 0-argument constructor.
 &lt;/p&gt;
       </documentation>
    </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         The contributed class must implement &lt;code&gt;org.eclipse.cdt.ui.text.IQuickAssistProcessor&lt;/code&gt;
+      </documentation>
+   </annotation>
+
+
    <annotation>
       <appInfo>
          <meta.section type="copyright"/>
@@ -149,4 +155,5 @@ with a public 0-argument constructor.
 All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
       </documentation>
    </annotation>
+
 </schema>
diff --git a/core/org.eclipse.cdt.ui/schema/quickFixProcessors.exsd b/core/org.eclipse.cdt.ui/schema/quickFixProcessors.exsd
index 377cd056857..b121f85897d 100644
--- a/core/org.eclipse.cdt.ui/schema/quickFixProcessors.exsd
+++ b/core/org.eclipse.cdt.ui/schema/quickFixProcessors.exsd
@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
 <schema targetNamespace="org.eclipse.cdt.ui" xmlns="http://www.w3.org/2001/XMLSchema">
-<include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
-
 <annotation>
       <appInfo>
          <meta.schema plugin="org.eclipse.cdt.ui" id="quickFixProcessors" name="Quick Fix Processor"/>
@@ -21,7 +19,9 @@ This extension point supports the &lt;code&gt;enablement&lt;/code&gt; tag. Prope
 &lt;/p&gt;
       </documentation>
    </annotation>
+
    <include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
+
    <element name="extension">
       <annotation>
          <appInfo>
@@ -58,6 +58,7 @@ This extension point supports the &lt;code&gt;enablement&lt;/code&gt; tag. Prope
          </attribute>
       </complexType>
    </element>
+
    <element name="quickFixProcessor">
       <complexType>
          <sequence>
@@ -99,6 +100,7 @@ with a public 0-argument constructor.
          </attribute>
       </complexType>
    </element>
+
    <element name="handledMarkerTypes">
       <annotation>
          <documentation>
@@ -112,6 +114,7 @@ If no handled marker type are specified, the processor will get problems of type
          </sequence>
       </complexType>
    </element>
+
    <element name="markerType">
       <complexType>
          <attribute name="id" type="string" use="required">
@@ -126,14 +129,7 @@ If no handled marker type are specified, the processor will get problems of type
          </attribute>
       </complexType>
    </element>
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The contributed class must implement &lt;code&gt;org.eclipse.cdt.ui.text.IQuickFixProcessor&lt;/code&gt;
-      </documentation>
-   </annotation>
+
    <annotation>
       <appInfo>
          <meta.section type="since"/>
@@ -142,6 +138,7 @@ If no handled marker type are specified, the processor will get problems of type
          4.1
       </documentation>
    </annotation>
+
    <annotation>
       <appInfo>
          <meta.section type="examples"/>
@@ -171,6 +168,17 @@ If no handled marker type are specified, the processor will get problems of type
 &lt;/p&gt;
       </documentation>
    </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         The contributed class must implement &lt;code&gt;org.eclipse.cdt.ui.text.IQuickFixProcessor&lt;/code&gt;
+      </documentation>
+   </annotation>
+
+
    <annotation>
       <appInfo>
          <meta.section type="copyright"/>
@@ -180,4 +188,5 @@ If no handled marker type are specified, the processor will get problems of type
 All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
       </documentation>
    </annotation>
+
 </schema>
diff --git a/core/org.eclipse.cdt.ui/schema/semanticHighlighting.exsd b/core/org.eclipse.cdt.ui/schema/semanticHighlighting.exsd
index be34da11f00..0b385401e32 100644
--- a/core/org.eclipse.cdt.ui/schema/semanticHighlighting.exsd
+++ b/core/org.eclipse.cdt.ui/schema/semanticHighlighting.exsd
@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
 <schema targetNamespace="org.eclipse.cdt.ui" xmlns="http://www.w3.org/2001/XMLSchema">
-<include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
-
 <annotation>
       <appInfo>
          <meta.schema plugin="org.eclipse.cdt.ui" id="semanticHighligher" name="Semantic Highlighting"/>
@@ -24,7 +22,9 @@ Contributed highlightings will be visible in the Code tree of the &apos;C/C++ -
 &lt;/p&gt;
       </documentation>
    </annotation>
+
    <include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
+
    <element name="extension">
       <annotation>
          <appInfo>
@@ -61,6 +61,7 @@ Contributed highlightings will be visible in the Code tree of the &apos;C/C++ -
          </attribute>
       </complexType>
    </element>
+
    <element name="semanticHighlighting">
       <complexType>
          <sequence>
@@ -168,14 +169,7 @@ The priorities of the built-in highlightings are available in &lt;code&gt;org.ec
          </attribute>
       </complexType>
    </element>
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         The contributed class must implement &lt;code&gt;org.eclipse.cdt.ui.text.ISemanticHighlighter&lt;/code&gt;
-      </documentation>
-   </annotation>
+
    <annotation>
       <appInfo>
          <meta.section type="since"/>
@@ -184,6 +178,7 @@ The priorities of the built-in highlightings are available in &lt;code&gt;org.ec
          8.2
       </documentation>
    </annotation>
+
    <annotation>
       <appInfo>
          <meta.section type="examples"/>
@@ -224,6 +219,17 @@ The priorities of the built-in highlightings are available in &lt;code&gt;org.ec
 &lt;/p&gt;
       </documentation>
    </annotation>
+
+   <annotation>
+      <appInfo>
+         <meta.section type="apiInfo"/>
+      </appInfo>
+      <documentation>
+         The contributed class must implement &lt;code&gt;org.eclipse.cdt.ui.text.ISemanticHighlighter&lt;/code&gt;
+      </documentation>
+   </annotation>
+
+
    <annotation>
       <appInfo>
          <meta.section type="copyright"/>
@@ -236,4 +242,5 @@ which accompanies this distribution, and is available at
 http://www.eclipse.org/legal/epl-v10.html
       </documentation>
    </annotation>
+
 </schema>
diff --git a/qt/org.eclipse.cdt.qt.core/schema/qmakeEnvProvider.exsd b/qt/org.eclipse.cdt.qt.core/schema/qmakeEnvProvider.exsd
index 2548edb64f8..00fe50ff479 100644
--- a/qt/org.eclipse.cdt.qt.core/schema/qmakeEnvProvider.exsd
+++ b/qt/org.eclipse.cdt.qt.core/schema/qmakeEnvProvider.exsd
@@ -1,8 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
 <schema targetNamespace="org.eclipse.cdt.qt.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<include schemaLocation="schema://org.eclipse.core.expressions/schema/expressionLanguage.exsd"/>
-
 <annotation>
       <appinfo>
          <meta.schema plugin="org.eclipse.cdt.qt.core" id="qmakeEnvProvider" name="QMake Environment Provider"/>
@@ -66,7 +64,7 @@
                </appinfo>
             </annotation>
          </attribute>
-         <attribute name="priority" type="integer" default="0">
+         <attribute name="priority" type="integer">
             <annotation>
                <documentation>
                   Priority of QMake environment provider. Less number means higher priority. Default priority is 0.
@@ -122,6 +120,7 @@
       </documentation>
    </annotation>
 
+
    <annotation>
       <appinfo>
          <meta.section type="copyright"/>