diff -up ./core/org.eclipse.cdt.core.tests/build.properties.fix ./core/org.eclipse.cdt.core.tests/build.properties
--- ./core/org.eclipse.cdt.core.tests/build.properties.fix	2015-07-02 15:59:34.707052374 -0400
+++ ./core/org.eclipse.cdt.core.tests/build.properties	2015-07-02 16:00:05.267565178 -0400
@@ -18,6 +18,7 @@ bin.includes = plugin.xml,\
                parser/org/eclipse/cdt/internal/pdom/tests/,\
                parser/org/eclipse/cdt/core/parser/tests/ast2/,\
                parser/org/eclipse/cdt/core/parser/tests/scanner/,\
+               parser/org/eclipse/cdt/core/parser/tests/rewrite/,\
                parser/org/eclipse/cdt/core/parser/tests/prefix/
 
 output.. = bin/
@@ -32,4 +33,4 @@ javacSource=1.7
 javacTarget=1.7
 javacProjectSettings=true
 src.includes = about.html
-                          
\ No newline at end of file
+                          
diff -up ./qt/org.eclipse.cdt.qt.tests/build.properties.fix ./qt/org.eclipse.cdt.qt.tests/build.properties
--- ./qt/org.eclipse.cdt.qt.tests/build.properties.fix	2015-07-02 15:53:36.316038589 -0400
+++ ./qt/org.eclipse.cdt.qt.tests/build.properties	2015-07-02 16:01:41.069172725 -0400
@@ -1,4 +1,5 @@
 source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
+               src/org/eclipse/cdt/qt/tests/,\
                .
diff -up ./releng/org.eclipse.cdt.repo/category.xml.fix ./releng/org.eclipse.cdt.repo/category.xml
--- ./releng/org.eclipse.cdt.repo/category.xml.fix	2015-07-07 18:44:17.456829932 -0400
+++ ./releng/org.eclipse.cdt.repo/category.xml	2015-07-07 18:43:23.632926770 -0400
@@ -44,9 +44,6 @@
    <feature url="features/org.eclipse.cdt.build.crossgcc_0.0.0.qualifier.jar" id="org.eclipse.cdt.build.crossgcc" version="0.0.0">
       <category name="extra"/>
    </feature>
-   <feature url="features/org.eclipse.cdt.launch.remote_0.0.0.qualifier.jar" id="org.eclipse.cdt.launch.remote" version="0.0.0">
-      <category name="extra"/>
-   </feature>
    <feature url="features/org.eclipse.cdt.msw_0.0.0.qualifier.jar" id="org.eclipse.cdt.msw" version="0.0.0">
       <category name="extra"/>
    </feature>
@@ -59,12 +56,6 @@
    <feature url="features/org.eclipse.cdt.gnu.multicorevisualizer_0.0.0.qualifier.jar" id="org.eclipse.cdt.gnu.multicorevisualizer" version="0.0.0">
       <category name="extra"/>
    </feature>
-   <feature url="features/org.eclipse.cdt.autotools_0.0.0.qualifier.jar" id="org.eclipse.cdt.autotools" version="0.0.0">
-      <category name="extra"/>
-   </feature>
-   <feature url="features/org.eclipse.cdt.autotools.source_0.0.0.qualifier.jar" id="org.eclipse.cdt.autotools.source" version="0.0.0">
-      <category name="extra"/>
-   </feature>
    <feature url="features/org.eclipse.cdt.testsrunner.feature_0.0.0.qualifier.jar" id="org.eclipse.cdt.testsrunner.feature" version="0.0.0">
       <category name="extra"/>
    </feature>
@@ -77,9 +68,6 @@
    <feature url="features/org.eclipse.cdt.qt_0.0.0.qualifier.jar" id="org.eclipse.cdt.qt" version="0.0.0">
       <category name="extra"/>
    </feature>
-   <feature url="features/org.eclipse.cdt.remote_0.0.0.qualifier.jar" id="org.eclipse.cdt.remote" version="0.0.0">
-      <category name="extra"/>
-   </feature>
    <feature url="features/org.eclipse.cdt.debug.standalone_0.0.0.qualifier.jar" id="org.eclipse.cdt.debug.standalone" version="0.0.0">
       <category name="extra"/>
    </feature>