diff --git a/com.ibm.wala.ide.tests/src/com/ibm/wala/eclipse/headless/Main.java b/com.ibm.wala.ide.jdt/source/com/ibm/wala/eclipse/headless/Main.java
similarity index 100%
rename from com.ibm.wala.ide.tests/src/com/ibm/wala/eclipse/headless/Main.java
rename to com.ibm.wala.ide.jdt/source/com/ibm/wala/eclipse/headless/Main.java
diff --git a/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF b/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF
index 5c2dfc465..f1cad4957 100644
--- a/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.ide.jsdt/META-INF/MANIFEST.MF
@@ -5,8 +5,7 @@ Bundle-SymbolicName: com.ibm.wala.ide.jsdt
 Bundle-Version: 1.3.4.qualifier
 Bundle-Activator: com.ibm.wala.ide.jsdt.Activator
 Bundle-Vendor: IBM
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.core.runtime,
  com.ibm.wala.cast,
  com.ibm.wala.cast.js,
  com.ibm.wala.cast.js.rhino,
@@ -16,8 +15,7 @@ Require-Bundle: org.eclipse.ui,
  com.ibm.wala.util,
  org.eclipse.wst.jsdt.core;bundle-version="1.1.0",
  org.eclipse.wst.jsdt.ui;bundle-version="1.1.0",
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.pde.core;bundle-version="3.6.0"
+ org.eclipse.core.resources;bundle-version="3.6.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: com.ibm.wala.cast.js.client,
diff --git a/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF b/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF
index a7f0dc353..af85310d2 100644
--- a/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.ide.tests/META-INF/MANIFEST.MF
@@ -13,7 +13,6 @@ Require-Bundle: com.ibm.wala.shrike,
  org.eclipse.jdt.core,
  org.eclipse.ui,
  org.eclipse.ui.ide,
- com.ibm.wala.ide.jdt;bundle-version="1.0.0",
  org.eclipse.osgi.services;bundle-version="3.3.100";resolution:=optional,
  org.eclipse.e4.ui.model.workbench;bundle-version="0.10.1";resolution:=optional,
  org.eclipse.e4.core.di;bundle-version="1.2.0";resolution:=optional,
diff --git a/com.ibm.wala.ide/META-INF/MANIFEST.MF b/com.ibm.wala.ide/META-INF/MANIFEST.MF
index 0b65e0c44..d47383d46 100644
--- a/com.ibm.wala.ide/META-INF/MANIFEST.MF
+++ b/com.ibm.wala.ide/META-INF/MANIFEST.MF
@@ -9,12 +9,13 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: com.ibm.wala.core,
  com.ibm.wala.shrike,
- org.eclipse.pde.core,
- org.eclipse.jface,
- org.eclipse.ui,
+ org.eclipse.pde.core;visibility:=reexport,
+ org.eclipse.jface;visibility:=reexport,
+ org.eclipse.ui;visibility:=reexport,
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
- org.eclipse.jdt.core
+ org.eclipse.jdt.core;visibility:=reexport,
+ org.eclipse.ui.ide;bundle-version="3.8.2";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: com.ibm.wala.ide.classloader,
@@ -22,4 +23,3 @@ Export-Package: com.ibm.wala.ide.classloader,
  com.ibm.wala.ide.plugin,
  com.ibm.wala.ide.ui,
  com.ibm.wala.ide.util
-Import-Package: com.ibm.wala.cast.java.ipa.callgraph