diff --git a/deprecated/examples/org.eclipse.uml2.examples.ui/plugin.xml b/deprecated/examples/org.eclipse.uml2.examples.ui/plugin.xml
index 46b6382..0c43dc3 100644
--- a/deprecated/examples/org.eclipse.uml2.examples.ui/plugin.xml
+++ b/deprecated/examples/org.eclipse.uml2.examples.ui/plugin.xml
@@ -12,7 +12,7 @@
  * Contributors: 
  *   IBM - Initial API and implementation
  *
- * $Id: plugin.xml,v 1.3 2004/05/17 19:52:39 khussey Exp $
+ * $Id: plugin.xml,v 1.4 2004/05/20 19:22:09 khussey Exp $
  */
 -->
 
@@ -25,8 +25,11 @@
 
    <requires>
       <import plugin="org.eclipse.core.runtime.compatibility"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.emf.ecore.xmi"/>
       <import plugin="org.eclipse.emf.edit.ui"/>
-      <import plugin="org.eclipse.uml2.editor"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.uml2.editor" export="true"/>
       <import plugin="org.eclipse.uml2.examples" export="true"/>
    </requires>
 
diff --git a/deprecated/examples/org.eclipse.uml2.examples/plugin.xml b/deprecated/examples/org.eclipse.uml2.examples/plugin.xml
index d081859..c4d2e38 100644
--- a/deprecated/examples/org.eclipse.uml2.examples/plugin.xml
+++ b/deprecated/examples/org.eclipse.uml2.examples/plugin.xml
@@ -12,7 +12,7 @@
  * Contributors: 
  *   IBM - Initial API and implementation
  *
- * $Id: plugin.xml,v 1.1 2004/04/29 15:14:39 khussey Exp $
+ * $Id: plugin.xml,v 1.2 2004/05/20 19:22:02 khussey Exp $
  */
 -->
 
@@ -26,6 +26,7 @@
    <requires>
       <import plugin="org.eclipse.core.runtime.compatibility"/>
       <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.emf.ecore.xmi"/>
       <import plugin="org.eclipse.uml2.edit" export="true"/>
    </requires>
 
diff --git a/deprecated/plugins/org.eclipse.uml2.editor/plugin.xml b/deprecated/plugins/org.eclipse.uml2.editor/plugin.xml
index 33aacd2..e9ca392 100644
--- a/deprecated/plugins/org.eclipse.uml2.editor/plugin.xml
+++ b/deprecated/plugins/org.eclipse.uml2.editor/plugin.xml
@@ -12,57 +12,60 @@
  * Contributors: 
  *   IBM - Initial API and implementation
  *
- * $Id: plugin.xml,v 1.3 2004/05/04 19:16:45 khussey Exp $
+ * $Id: plugin.xml,v 1.4 2004/05/20 19:22:05 khussey Exp $
  */
 -->
 
 <plugin
-    id = "org.eclipse.uml2.editor"
-    version = "1.0.0"
-    name = "%pluginName"
-    provider-name = "%providerName"
-    class = "org.eclipse.uml2.presentation.UML2EditorPlugin$Implementation">
+   id = "org.eclipse.uml2.editor"
+   version = "1.0.0"
+   name = "%pluginName"
+   provider-name = "%providerName"
+   class = "org.eclipse.uml2.presentation.UML2EditorPlugin$Implementation">
 
-  <requires>
-    <import plugin="org.eclipse.core.runtime.compatibility"/>
-    <import plugin="org.eclipse.emf.ecore.edit"/>
-    <import plugin="org.eclipse.emf.edit.ui"/>
-    <import plugin="org.eclipse.uml2.edit" export="true"/>
-  </requires>
+   <requires>
+      <import plugin="org.eclipse.core.runtime.compatibility"/>
+      <import plugin="org.eclipse.core.resources"/>
+      <import plugin="org.eclipse.emf.ecore.edit"/>
+      <import plugin="org.eclipse.emf.ecore.xmi"/>
+      <import plugin="org.eclipse.emf.edit.ui"/>
+      <import plugin="org.eclipse.ui.ide"/>
+      <import plugin="org.eclipse.uml2.edit" export="true"/>
+   </requires>
 
-  <runtime>
-    <library name="uml2.editor.jar">
-      <export name="*"/>
-      <packages prefixes="org.eclipse.uml2.presentation"/>
-    </library>
-  </runtime>
+   <runtime>
+      <library name="uml2.editor.jar">
+        <export name="*"/>
+        <packages prefixes="org.eclipse.uml2.presentation"/>
+      </library>
+   </runtime>
 
-  <extension
-    point = "org.eclipse.ui.newWizards">
-    <category
-       id = "org.eclipse.emf.ecore.Wizard.category.ID"
-       name="%_UI_Wizard_category">
-    </category>
-    <wizard
-        id = "org.eclipse.uml2.presentation.UML2ModelWizardID"
-        name = "%_UI_UML2ModelWizard_label"
-        class = "org.eclipse.uml2.presentation.UML2ModelWizard"
-        category = "org.eclipse.emf.ecore.Wizard.category.ID"
-        icon = "icons/full/ctool16/NewUML2.gif">
-      <description>%_UI_UML2ModelWizard_description</description>
-      <selection class = "org.eclipse.core.resources.IResource" />
-    </wizard>
-  </extension>
+   <extension
+      point = "org.eclipse.ui.newWizards">
+      <category
+         id = "org.eclipse.emf.ecore.Wizard.category.ID"
+         name="%_UI_Wizard_category">
+      </category>
+      <wizard
+         id = "org.eclipse.uml2.presentation.UML2ModelWizardID"
+         name = "%_UI_UML2ModelWizard_label"
+         class = "org.eclipse.uml2.presentation.UML2ModelWizard"
+         category = "org.eclipse.emf.ecore.Wizard.category.ID"
+         icon = "icons/full/ctool16/NewUML2.gif">
+         <description>%_UI_UML2ModelWizard_description</description>
+         <selection class = "org.eclipse.core.resources.IResource" />
+      </wizard>
+   </extension>
 
-  <extension point = "org.eclipse.ui.editors">
-    <editor
-        id = "org.eclipse.uml2.presentation.UML2EditorID"
-        name = "%_UI_UML2Editor_label"
-        icon = "icons/full/obj16/UML2ModelFile.gif"
-        extensions = "uml2"
-        class = "org.eclipse.uml2.presentation.UML2Editor" 
-        contributorClass="org.eclipse.uml2.presentation.UML2ActionBarContributor" >
-    </editor>
-  </extension>
+   <extension point = "org.eclipse.ui.editors">
+      <editor
+         id = "org.eclipse.uml2.presentation.UML2EditorID"
+         name = "%_UI_UML2Editor_label"
+         icon = "icons/full/obj16/UML2ModelFile.gif"
+         extensions = "uml2"
+         class = "org.eclipse.uml2.presentation.UML2Editor" 
+         contributorClass="org.eclipse.uml2.presentation.UML2ActionBarContributor" >
+      </editor>
+   </extension>
 
 </plugin>
diff --git a/deprecated/plugins/org.eclipse.uml2/plugin.xml b/deprecated/plugins/org.eclipse.uml2/plugin.xml
index fef80cb..82dd8db 100644
--- a/deprecated/plugins/org.eclipse.uml2/plugin.xml
+++ b/deprecated/plugins/org.eclipse.uml2/plugin.xml
@@ -12,7 +12,7 @@
  * Contributors: 
  *   IBM - Initial API and implementation
  *
- * $Id: plugin.xml,v 1.4 2004/05/04 19:17:48 khussey Exp $
+ * $Id: plugin.xml,v 1.5 2004/05/20 19:22:12 khussey Exp $
  */
 -->
 
@@ -33,7 +33,7 @@
    <requires>
       <import plugin="org.eclipse.core.runtime.compatibility"/>
       <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.emf.ecore.xmi" export="true"/>
+      <import plugin="org.eclipse.emf.ecore.xmi"/>
    </requires>
 
    <extension
diff --git a/deprecated/tests/org.eclipse.uml2.tests/plugin.xml b/deprecated/tests/org.eclipse.uml2.tests/plugin.xml
index f45b4ea..59f5a7d 100644
--- a/deprecated/tests/org.eclipse.uml2.tests/plugin.xml
+++ b/deprecated/tests/org.eclipse.uml2.tests/plugin.xml
@@ -12,7 +12,7 @@
  * Contributors: 
  *   IBM - Initial API and implementation
  *
- * $Id: plugin.xml,v 1.2 2004/05/04 19:16:36 khussey Exp $
+ * $Id: plugin.xml,v 1.3 2004/05/20 19:21:55 khussey Exp $
  */
 -->
 
@@ -27,6 +27,7 @@
    </runtime>
 
    <requires>
+      <import plugin="org.eclipse.emf.ecore.xmi"/>
       <import plugin="org.eclipse.uml2"/>
       <import plugin="org.junit"/>
    </requires>