diff --git a/core/org.eclipse.cdt.core/.classpath b/core/org.eclipse.cdt.core/.classpath
index 699de63c4a3..34631a2a307 100644
--- a/core/org.eclipse.cdt.core/.classpath
+++ b/core/org.eclipse.cdt.core/.classpath
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-    <classpathentry kind="src" path="builder"/>
-    <classpathentry kind="src" path="index"/>
-    <classpathentry kind="src" path="model"/>
-    <classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="utils"/>
     <classpathentry kind="src" path="/org.eclipse.ui"/>
     <classpathentry kind="src" path="/org.eclipse.core.resources"/>
     <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
@@ -15,5 +10,10 @@
     <classpathentry kind="src" path="/org.eclipse.debug.core"/>
     <classpathentry kind="src" path="/org.eclipse.core.boot"/>
     <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
+    <classpathentry kind="src" path="builder"/>
+    <classpathentry kind="src" path="index"/>
+    <classpathentry kind="src" path="model"/>
+    <classpathentry kind="src" path="src"/>
+    <classpathentry kind="src" path="utils"/>
     <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/core/org.eclipse.cdt.core/build.properties b/core/org.eclipse.cdt.core/build.properties
index 3a65567dd2b..19d14fe97af 100644
--- a/core/org.eclipse.cdt.core/build.properties
+++ b/core/org.eclipse.cdt.core/build.properties
@@ -3,3 +3,8 @@ source.cdt.jar = builder,\
                  model,\
                  src,\
                  utils/
+source.cdtcore.jar = builder/,\
+                     index/,\
+                     model/,\
+                     src/,\
+                     utils/
diff --git a/core/org.eclipse.cdt.core/plugin.xml b/core/org.eclipse.cdt.core/plugin.xml
index 846ef046b95..4249fd84236 100644
--- a/core/org.eclipse.cdt.core/plugin.xml
+++ b/core/org.eclipse.cdt.core/plugin.xml
@@ -7,7 +7,9 @@
    class="org.eclipse.cdt.internal.CCorePlugin">
 
    <runtime>
-      <library name="cdtcore.jar"/>
+      <library name="cdtcore.jar">
+         <export name="*"/>
+      </library>
    </runtime>
 <!-- ======================================================================= -->
 <!-- The C Plugin                                                            -->