diff --git a/org.eventb.texteditor.parsers/.classpath b/org.eventb.texteditor.parsers/.classpath
index 082674f0cbd74fbd5cdd83544e87b6a524699aff..3de90f287e14f5376c4bf47306533a5ea43620df 100644
--- a/org.eventb.texteditor.parsers/.classpath
+++ b/org.eventb.texteditor.parsers/.classpath
@@ -6,9 +6,6 @@
 	<classpathentry exported="true" kind="lib" path="lib/jsr305-1.3.9.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/parserbase-2.4.22-SNAPSHOT.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/prologlib-2.4.22-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/bparser-2.4.28-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/parserbase-2.4.28-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/prologlib-2.4.28-SNAPSHOT.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
diff --git a/org.eventb.texteditor.ui/.classpath b/org.eventb.texteditor.ui/.classpath
index ad4b38cb3f3926d0413260d0ad7d739a89efd97b..0208a9bb408e392740408d0a8243d58ad93668e6 100644
--- a/org.eventb.texteditor.ui/.classpath
+++ b/org.eventb.texteditor.ui/.classpath
@@ -3,6 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/commons-lang-2.4.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eventb.texteditor.ui/META-INF/MANIFEST.MF b/org.eventb.texteditor.ui/META-INF/MANIFEST.MF
index 6e4dfca7d95bbeb3ca20110cd8129cdedf66562f..9053f7d8beaefd14fe7dce10e9c5665f19d2cb8b 100644
--- a/org.eventb.texteditor.ui/META-INF/MANIFEST.MF
+++ b/org.eventb.texteditor.ui/META-INF/MANIFEST.MF
@@ -16,7 +16,8 @@ Require-Bundle: org.eventb.texttools;bundle-version="[2.0.0,3.1.0)";visibility:=
  org.eclipse.ui.ide;bundle-version="[3.8.2,4.0.0)",
  org.rodinp.keyboard.ui;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.ui.workbench.texteditor,
- org.eventb.texteditor.parsers;bundle-version="1.0.0"
+ org.eventb.texteditor.parsers;bundle-version="1.0.0",
+ org.eclipse.core.resources;bundle-version="3.8.1"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: lib/commons-lang-2.4.jar,
diff --git a/org.eventb.texttools/.classpath b/org.eventb.texttools/.classpath
index 741e9589c39db666715fc48687347e6ceb672671..7cf64e5fb72d59ff34fea741d41ab09483260ec5 100644
--- a/org.eventb.texttools/.classpath
+++ b/org.eventb.texttools/.classpath
@@ -4,10 +4,5 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="src" path="src_generated"/>
-	<classpathentry kind="lib" path="lib/EventBParser.jar"/>
 	<classpathentry kind="output" path="bin"/>
-	<classpathentry exported="true" kind="lib" path="lib/dependencies/bparser-2.4.22-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/dependencies/jsr305-1.3.9.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/dependencies/parserbase-2.4.22-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/dependencies/prologlib-2.4.22-SNAPSHOT.jar"/>
 </classpath>
diff --git a/org.eventb.texttools/META-INF/MANIFEST.MF b/org.eventb.texttools/META-INF/MANIFEST.MF
index a27ba55f2ab8d87537ee978d184290d74e1a4991..7019ca1284492de280916eb2db4f75b65c648209 100644
--- a/org.eventb.texttools/META-INF/MANIFEST.MF
+++ b/org.eventb.texttools/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.jface.text;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.emf.compare;bundle-version="[1.2.2,2.0.0)",
  org.eclipse.emf.compare.diff;bundle-version="[1.2.2,2.0.0)",
  org.eclipse.emf.compare.match;bundle-version="[1.2.2,2.0.0)",
- org.eclipse.core.resources;bundle-version="[3.8.1,4.0.0)";visibility:=reexport,
+ org.eclipse.core.resources;bundle-version="[3.8.1,4.0.0)",
  org.eclipse.emf.ecore,
  org.eventb.texteditor.parsers;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy