diff --git a/org.eclipse.jdt.debug/.classpath b/org.eclipse.jdt.debug/.classpath
index b622aef..ac8396d 100644
--- a/org.eclipse.jdt.debug/.classpath
+++ b/org.eclipse.jdt.debug/.classpath
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
     <classpathentry kind="src" path="jdi"/>
-    <classpathentry kind="lib" path="jdi.jar"/>
     <classpathentry kind="src" path="model"/>
+    <classpathentry kind="src" path="/org.eclipse.core.boot"/>
+    <classpathentry kind="src" path="/org.eclipse.core.runtime"/>
+    <classpathentry kind="src" path="/org.apache.xerces"/>
+    <classpathentry kind="src" path="/org.eclipse.core.resources"/>
     <classpathentry kind="src" path="/org.eclipse.debug.core"/>
-    <classpathentry kind="var" path="JRE_LIB"/>
-    <classpathentry kind="lib" path="/org.apache.xerces/xerces.jar"/>
-    <classpathentry kind="lib"
-        path="/org.eclipse.core.resources/resources.jar" sourcepath="/org.eclipse.core.resources/resourcessrc.zip"/>
-    <classpathentry kind="lib"
-        path="/org.eclipse.core.runtime/runtime.jar" sourcepath="/org.eclipse.core.runtime/runtimesrc.zip"/>
     <classpathentry kind="src" path="/org.eclipse.jdt.core"/>
+    <classpathentry exported="true" kind="lib" path="jdi.jar" sourcepath="/org.eclipse.jdt.debug/jdisrc.zip"/>
+    <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
     <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.jdt.debug/.vcm_meta b/org.eclipse.jdt.debug/.vcm_meta
index dafd58f..5309d39 100644
--- a/org.eclipse.jdt.debug/.vcm_meta
+++ b/org.eclipse.jdt.debug/.vcm_meta
@@ -3,6 +3,10 @@
 	<nature id="org.eclipse.jdt.core.javanature"/>
 	<reference project-name="org.eclipse.debug.core"/>
 	<reference project-name="org.eclipse.jdt.core"/>
+	<reference project-name="org.eclipse.core.boot"/>
+	<reference project-name="org.eclipse.core.runtime"/>
+	<reference project-name="org.apache.xerces"/>
+	<reference project-name="org.eclipse.core.resources"/>
 	<builder name="org.eclipse.jdt.core.javabuilder">
 	</builder>
 </project-description>