diff --git a/core/org.eclipse.cdt.core.aix/.template b/core/org.eclipse.cdt.core.aix/.template
deleted file mode 100644
index d65e0f4481d..00000000000
--- a/core/org.eclipse.cdt.core.aix/.template
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<form>
-   <p/><p><b>Tips on working with this plug-in project</b></p><li>For the view of the new plug-in at a glance, go to the <img href="pageImage"/><a href="OverviewPage">Overview</a>.</li><li>You can test the contributions of this plug-in by launching another instance of the workbench. On the <b>Run</b> menu, click <b>Run As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.run">Run-time Workbench</a> from the available choices.</li><li>You can add more functionality to this plug-in by adding extensions using the <a href="action.newExtension">New Extension Wizard</a>.</li><li>The plug-in project contains Java code that you can debug. Place breakpoints in Java classes. On the <b>Run</b> menu, select <b>Debug As</b> and choose <img href="runTimeWorkbenchImage"/><a href="action.debug">Run-time Workbench</a> from the available choices.</li>
-</form>
diff --git a/core/org.eclipse.cdt.core.aix/fragment.xml b/core/org.eclipse.cdt.core.aix/fragment.xml
index 53abef561d3..e546fd258f5 100644
--- a/core/org.eclipse.cdt.core.aix/fragment.xml
+++ b/core/org.eclipse.cdt.core.aix/fragment.xml
@@ -4,7 +4,7 @@
    id="org.eclipse.cdt.core.aix"
    name="%fragmentName.aix"
    version="3.0.0"
-   provider-name="Eclipse.org"
+   provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
    plugin-version="3.0.0">
 
diff --git a/core/org.eclipse.cdt.core.linux/fragment.xml b/core/org.eclipse.cdt.core.linux/fragment.xml
index e208362603e..33d4b7528a3 100644
--- a/core/org.eclipse.cdt.core.linux/fragment.xml
+++ b/core/org.eclipse.cdt.core.linux/fragment.xml
@@ -4,7 +4,7 @@
    id="org.eclipse.cdt.core.linux"
    name="%fragmentName.linux"
    version="3.0.0"
-   provider-name="Eclipse.org"
+   provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
    plugin-version="3.0.0">
 
diff --git a/core/org.eclipse.cdt.core.macosx/.cdtproject b/core/org.eclipse.cdt.core.macosx/.cdtproject
deleted file mode 100644
index 31dce0c7c03..00000000000
--- a/core/org.eclipse.cdt.core.macosx/.cdtproject
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse-cdt version="2.0"?>
-
-<cdtproject>
-<data/>
-</cdtproject>
diff --git a/core/org.eclipse.cdt.core.qnx/fragment.xml b/core/org.eclipse.cdt.core.qnx/fragment.xml
index a401bb6f702..0aaab17cbeb 100644
--- a/core/org.eclipse.cdt.core.qnx/fragment.xml
+++ b/core/org.eclipse.cdt.core.qnx/fragment.xml
@@ -4,7 +4,7 @@
    id="org.eclipse.cdt.core.qnx"
    name="%fragmentName.qnx"
    version="3.0.0"
-   provider-name="Eclipse.org"
+   provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
    plugin-version="3.0.0">
 
diff --git a/core/org.eclipse.cdt.core.solaris/fragment.xml b/core/org.eclipse.cdt.core.solaris/fragment.xml
index affc40e0f45..83d78b5b172 100644
--- a/core/org.eclipse.cdt.core.solaris/fragment.xml
+++ b/core/org.eclipse.cdt.core.solaris/fragment.xml
@@ -4,7 +4,7 @@
    id="org.eclipse.cdt.core.solaris"
    name="%fragmentName.solaris"
    version="3.0.0"
-   provider-name="Eclipse.org"
+   provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
    plugin-version="3.0.0">
 
diff --git a/core/org.eclipse.cdt.core.win32/fragment.xml b/core/org.eclipse.cdt.core.win32/fragment.xml
index 7de0b2760e7..d095abb352e 100644
--- a/core/org.eclipse.cdt.core.win32/fragment.xml
+++ b/core/org.eclipse.cdt.core.win32/fragment.xml
@@ -4,7 +4,7 @@
    id="org.eclipse.cdt.core.win32"
    name="%fragmentName.win32"
    version="3.0.0"
-   provider-name="Eclipse.org"
+   provider-name="%providerName"
    plugin-id="org.eclipse.cdt.core"
    plugin-version="3.0.0">