diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewContentProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewContentProvider.java
index 1f986b684c5..50663f1d3be 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewContentProvider.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/team/SystemTeamViewContentProvider.java
@@ -21,6 +21,7 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Platform;
+import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.rse.core.SystemBasePlugin;
 import org.eclipse.rse.core.SystemResourceManager;
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemBaseForm.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemBaseForm.java
index 8630392607d..0f7487aecd1 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemBaseForm.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/SystemBaseForm.java
@@ -169,7 +169,7 @@ public abstract class SystemBaseForm
 	/**
 	 * The completeness of the page has changed.
 	 * We direct it to the Apply button versus just the OK button
-	 * @see {@link #addPageCompleteListener(ISystemPageCompleteListener)}
+	 * @see #addPageCompleteListener(ISystemPageCompleteListener)
 	 */
 	protected void setPageComplete(boolean complete)
 	{
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectConnectionDialog.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectConnectionDialog.java
index bd9001f6887..2fd78826942 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectConnectionDialog.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/dialogs/SystemSelectConnectionDialog.java
@@ -19,8 +19,10 @@ package org.eclipse.rse.ui.dialogs;
 
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.ui.ISystemPageCompleteListener;
+import org.eclipse.rse.ui.SystemBaseForm;
 import org.eclipse.rse.ui.SystemResources;
 import org.eclipse.rse.ui.messages.ISystemMessageLine;
+import org.eclipse.rse.ui.validators.IValidatorRemoteSelection;
 import org.eclipse.rse.ui.widgets.SystemSelectConnectionForm;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -352,7 +354,7 @@ public class SystemSelectConnectionDialog
 	/**
 	 * The callback method. 
 	 * This is called whenever setPageComplete is called by the form code.
-	 * @see {@link SystemBaseForm#addPageCompleteListener(ISystemPageCompleteListener)} 
+	 * @see SystemBaseForm#addPageCompleteListener(ISystemPageCompleteListener) 
 	 */
 	public void setPageComplete(boolean complete)
 	{
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServiceTableContentProvider.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServiceTableContentProvider.java
index 9ce9d79b76c..ec4f3ecb8fd 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServiceTableContentProvider.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/services/ServiceTableContentProvider.java
@@ -17,6 +17,8 @@
 package org.eclipse.rse.ui.widgets.services;
 import java.util.ArrayList;
 
+import org.eclipse.jface.viewers.IContentProvider;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 
diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/util/ISubSystemConfigurationAdapter.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/util/ISubSystemConfigurationAdapter.java
index d6f1b460203..fe736301f86 100644
--- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/util/ISubSystemConfigurationAdapter.java
+++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/util/ISubSystemConfigurationAdapter.java
@@ -25,6 +25,7 @@ import org.eclipse.rse.core.filters.ISystemFilterPool;
 import org.eclipse.rse.core.filters.ISystemFilterPoolReference;
 import org.eclipse.rse.core.filters.ISystemFilterReference;
 import org.eclipse.rse.core.filters.ISystemFilterString;
+import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.core.model.ISystemNewConnectionWizardPage;
 import org.eclipse.rse.core.subsystems.ISubSystem;
 import org.eclipse.rse.core.subsystems.ISubSystemConfiguration;
@@ -73,7 +74,7 @@ public interface ISubSystemConfigurationAdapter
 	 * <ul>
 	 *   <li>The wizard pages must implement ISystemNewConnectionWizardPage, so as to fit into the wizard's framework
 	 *   <li>When the user successfully presses Finish, the createConnection method in the SystemRegistry will call 
-	 *        your {@link #createSubSystem(IHost,boolean, ISystemNewConnectionWizardPage[])} method to create the 
+	 *        your {@link ISubSystemConfiguration#createSubSystem(IHost,boolean, ISystemNewConnectionWizardPage[])} method to create the 
 	 *        your subsystem for the connection. The same pages you return here are passed back to you so you can 
 	 *        interrogate them for the user-entered data and use it when creating the default subsystem instance.
 	 * </ul>
@@ -168,7 +169,7 @@ public interface ISubSystemConfigurationAdapter
      * <p>
      * Most actions are handled in this base, except if you have your own action for
      * creating a new filter. In this case, <b>override getNewFilterAction()</b>
-     * To add additional actions, override {@link #getFilterReferenceActions(ISystemFilterReference, Shell)}.
+     * To add additional actions, override {@link #getFilterReferenceActions(ISubSystemConfiguration, ISystemFilterReference, Shell)}.
      *
      * @param selectedFilterRef the currently selected filter reference
      * @param shell parent shell of viewer where the popup menu is being constructed
@@ -187,7 +188,7 @@ public interface ISubSystemConfigurationAdapter
     // --------------------------
 	/**
 	 * Return the form used in the property page, etc for this server launcher.
-	 * Only called if {@link #supportsServerLaunchProperties()} returns true.
+	 * Only called if {@link ISubSystemConfiguration#supportsServerLaunchProperties(IHost)} returns true.
 	 */
 	public IServerLauncherForm getServerLauncherForm(ISubSystemConfiguration factory, Shell shell, ISystemMessageLine msgLine);