diff --git a/launch/org.eclipse.cdt.launch/plugin.xml b/launch/org.eclipse.cdt.launch/plugin.xml
index 9fb7db2cad8..9b298b82b29 100644
--- a/launch/org.eclipse.cdt.launch/plugin.xml
+++ b/launch/org.eclipse.cdt.launch/plugin.xml
@@ -16,6 +16,8 @@
             sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
             sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer">
       </launchDelegate>
+
+      <!-- Deprecated, See Bug 517722 -->
       <launchDelegate
             delegate="org.eclipse.cdt.launch.internal.MultiLaunchConfigurationDelegate"
             delegateDescription="%LaunchGroup.description"
@@ -87,6 +89,7 @@
 
     <extension
          point="org.eclipse.debug.core.launchConfigurationTypes">
+      <!-- Deprecated, See Bug 517722 -->
       <launchConfigurationType
             id="org.eclipse.cdt.launch.launchGroup"
             name="%LaunchGroup.name"
@@ -96,6 +99,7 @@
    
       <extension
          point="org.eclipse.debug.ui.launchConfigurationTabGroups">
+      <!-- Deprecated, See Bug 517722 -->
       <launchConfigurationTabGroup
             class="org.eclipse.cdt.launch.internal.ui.MultiLaunchConfigurationTabGroup"
             id="org.eclipse.cdt.launch.launchGroup.tabgroup"
@@ -105,6 +109,7 @@
    
    <extension
          point="org.eclipse.debug.ui.launchConfigurationTypeImages">
+      <!-- Deprecated, See Bug 517722 -->
      <launchConfigurationTypeImage
             icon="icons/obj16/exec_obj.gif"
             configTypeID="org.eclipse.cdt.launch.launchGroup"
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/MultiLaunchConfigurationDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/MultiLaunchConfigurationDelegate.java
index 6550fc375bd..ab34a77dc59 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/MultiLaunchConfigurationDelegate.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/MultiLaunchConfigurationDelegate.java
@@ -49,7 +49,9 @@ import org.eclipse.ui.activities.WorkbenchActivityHelper;
 
 /**
  * Group Launch delegate. Launches each configuration in the user selected mode
+ * @deprecated See Bug 517722, Launch Groups are now part of Platform.
  */
+@Deprecated
 public class MultiLaunchConfigurationDelegate extends LaunchConfigurationDelegate implements
 		ILaunchConfigurationDelegate2 {
 	public static final String DEFAULT_MODE = "default"; //$NON-NLS-1$
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationSelectionDialog.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationSelectionDialog.java
index e7452c869e9..abba54f30af 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationSelectionDialog.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationSelectionDialog.java
@@ -64,7 +64,9 @@ import org.eclipse.ui.dialogs.PatternFilter;
 
 /**
  * Dialog to select launch configuration(s)
+ * @deprecated See Bug 517722, Launch Groups are now part of Platform.
  */
+@Deprecated
 public class MultiLaunchConfigurationSelectionDialog extends TitleAreaDialog implements ISelectionChangedListener {
 	private ViewerFilter[] fFilters = null;
 	private ISelection fSelection;
diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationTabGroup.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationTabGroup.java
index e5d7a584e1e..218a6e2d506 100644
--- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationTabGroup.java
+++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/MultiLaunchConfigurationTabGroup.java
@@ -59,7 +59,9 @@ import org.eclipse.ui.PlatformUI;
 
 /**
  * Tab group for Launch Group.
+ * @deprecated See Bug 517722, Launch Groups are now part of Platform.
  */
+@Deprecated
 public class MultiLaunchConfigurationTabGroup extends AbstractLaunchConfigurationTabGroup {
 	static class ContentProvider implements IStructuredContentProvider, ITreeContentProvider {
 		protected List<LaunchElement> input;