diff --git a/platform/platform-api/src/com/intellij/openapi/components/ComponentConfig.java b/platform/core-api/src/com/intellij/openapi/components/ComponentConfig.java
similarity index 94%
rename from platform/platform-api/src/com/intellij/openapi/components/ComponentConfig.java
rename to platform/core-api/src/com/intellij/openapi/components/ComponentConfig.java
index 28776cc09bc2..b69a9d59b4d7 100644
--- a/platform/platform-api/src/com/intellij/openapi/components/ComponentConfig.java
+++ b/platform/core-api/src/com/intellij/openapi/components/ComponentConfig.java
@@ -16,7 +16,7 @@
 
 package com.intellij.openapi.components;
 
-import com.intellij.ide.plugins.IdeaPluginDescriptor;
+import com.intellij.openapi.extensions.PluginDescriptor;
 import com.intellij.util.xmlb.annotations.MapAnnotation;
 import com.intellij.util.xmlb.annotations.Property;
 import com.intellij.util.xmlb.annotations.Tag;
@@ -46,7 +46,7 @@ public class ComponentConfig {
   public Map<String,String> options = new HashMap<String, String>();
 
   @Transient
-  public IdeaPluginDescriptor pluginDescriptor;
+  public PluginDescriptor pluginDescriptor;
 
   @Transient
   public ClassLoader getClassLoader() {
diff --git a/platform/platform-api/src/com/intellij/openapi/components/ComponentManagerConfig.java b/platform/core-api/src/com/intellij/openapi/components/ComponentManagerConfig.java
similarity index 100%
rename from platform/platform-api/src/com/intellij/openapi/components/ComponentManagerConfig.java
rename to platform/core-api/src/com/intellij/openapi/components/ComponentManagerConfig.java
diff --git a/platform/platform-impl/src/com/intellij/openapi/components/ex/ComponentManagerEx.java b/platform/platform-impl/src/com/intellij/openapi/components/ex/ComponentManagerEx.java
index 351589fb4850..841e3a1eafd7 100644
--- a/platform/platform-impl/src/com/intellij/openapi/components/ex/ComponentManagerEx.java
+++ b/platform/platform-impl/src/com/intellij/openapi/components/ex/ComponentManagerEx.java
@@ -15,13 +15,10 @@
  */
 package com.intellij.openapi.components.ex;
 
-import com.intellij.ide.plugins.IdeaPluginDescriptor;
-import com.intellij.notification.Notification;
 import com.intellij.openapi.components.ComponentConfig;
 import com.intellij.openapi.components.ComponentManager;
 import com.intellij.openapi.components.impl.stores.IComponentStore;
-import com.intellij.openapi.project.Project;
-import org.jetbrains.annotations.NotNull;
+import com.intellij.openapi.extensions.PluginDescriptor;
 
 import java.util.Map;
 
@@ -40,7 +37,7 @@ public interface ComponentManagerEx extends ComponentManager {
   void registerComponent(Class interfaceClass, Class implementationClass, Map options);
 
   void registerComponent(ComponentConfig config);
-  void registerComponent(ComponentConfig config, IdeaPluginDescriptor pluginDescriptor);
+  void registerComponent(ComponentConfig config, PluginDescriptor pluginDescriptor);
 
   IComponentStore getComponentStore();
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/ComponentManagerConfigurator.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/ComponentManagerConfigurator.java
index 888a8b9cb8ec..23522e16b531 100644
--- a/platform/platform-impl/src/com/intellij/openapi/components/impl/ComponentManagerConfigurator.java
+++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/ComponentManagerConfigurator.java
@@ -15,8 +15,8 @@
  */
 package com.intellij.openapi.components.impl;
 
-import com.intellij.ide.plugins.IdeaPluginDescriptor;
 import com.intellij.openapi.components.ComponentConfig;
+import com.intellij.openapi.extensions.PluginDescriptor;
 
 class ComponentManagerConfigurator {
   private final ComponentManagerImpl myComponentManager;
@@ -25,13 +25,13 @@ class ComponentManagerConfigurator {
     myComponentManager = componentManager;
   }
 
-  private void loadConfiguration(final ComponentConfig[] configs, final boolean defaultProject, final IdeaPluginDescriptor descriptor) {
+  private void loadConfiguration(final ComponentConfig[] configs, final boolean defaultProject, final PluginDescriptor descriptor) {
     for (ComponentConfig config : configs) {
       loadSingleConfig(defaultProject, config, descriptor);
     }
   }
 
-  private void loadSingleConfig(final boolean defaultProject, final ComponentConfig config, final IdeaPluginDescriptor descriptor) {
+  private void loadSingleConfig(final boolean defaultProject, final ComponentConfig config, final PluginDescriptor descriptor) {
     if (defaultProject && config.skipForDefaultProject) return;
     if (!myComponentManager.isComponentSuitable(config.options)) return;
 
@@ -39,7 +39,7 @@ class ComponentManagerConfigurator {
   }
 
   public void loadComponentsConfiguration(final ComponentConfig[] components,
-                                          final IdeaPluginDescriptor descriptor,
+                                          final PluginDescriptor descriptor,
                                           final boolean defaultProject) {
     if (components == null) return;
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java
index 7f661943cc81..e078741e5355 100644
--- a/platform/platform-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/ComponentManagerImpl.java
@@ -16,7 +16,6 @@
 package com.intellij.openapi.components.impl;
 
 import com.intellij.diagnostic.PluginException;
-import com.intellij.ide.plugins.IdeaPluginDescriptor;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ex.ApplicationManagerEx;
 import com.intellij.openapi.application.impl.ApplicationInfoImpl;
@@ -24,6 +23,7 @@ import com.intellij.openapi.components.*;
 import com.intellij.openapi.components.ex.ComponentManagerEx;
 import com.intellij.openapi.components.impl.stores.IComponentStore;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.extensions.PluginDescriptor;
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.ProgressManager;
@@ -279,7 +279,7 @@ public abstract class ComponentManagerImpl extends UserDataHolderBase implements
   }
 
   @SuppressWarnings({"NonPrivateFieldAccessedInSynchronizedContext"})
-  public synchronized void registerComponent(final ComponentConfig config, final IdeaPluginDescriptor pluginDescriptor) {
+  public synchronized void registerComponent(final ComponentConfig config, final PluginDescriptor pluginDescriptor) {
     if (isHeadless()) {
       String headlessImplClass = config.headlessImplementationClass;
       if (headlessImplClass != null) {
@@ -390,7 +390,7 @@ public abstract class ComponentManagerImpl extends UserDataHolderBase implements
     getComponents();
   }
 
-  protected void loadComponentsConfiguration(ComponentConfig[] components, @Nullable final IdeaPluginDescriptor descriptor, final boolean defaultProject) {
+  protected void loadComponentsConfiguration(ComponentConfig[] components, @Nullable final PluginDescriptor descriptor, final boolean defaultProject) {
     myConfigurator.loadComponentsConfiguration(components, descriptor, defaultProject);
   }