--- a/core/com.nokia.carbide.cpp.ui/META-INF/MANIFEST.MF	Tue Aug 31 17:03:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.ui/META-INF/MANIFEST.MF	Tue Aug 31 18:54:57 2010 -0500
@@ -12,7 +12,8 @@
  com.nokia.cpp.utils.ui,
  com.nokia.sdt.utils,
  org.eclipse.core.resources,
- org.eclipse.ui.forms
+ org.eclipse.ui.forms,
+ com.nokia.carbide.cpp.featureTracker;bundle-version="3.0.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.carbide.cpp.internal.ui.images;
   x-friends:="com.nokia.sdt.symbian,

--- a/core/com.nokia.carbide.cpp.ui/src/com/nokia/carbide/cpp/ui/CarbideUIPlugin.java	Tue Aug 31 17:03:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp.ui/src/com/nokia/carbide/cpp/ui/CarbideUIPlugin.java	Tue Aug 31 18:54:57 2010 -0500
@@ -21,6 +21,7 @@
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
+import com.nokia.carbide.cpp.internal.featureTracker.FeatureUseTrackerPlugin;
 import com.nokia.carbide.cpp.internal.ui.SharedImages;
 import com.nokia.cpp.internal.api.utils.core.Logging;
 
@@ -32,6 +33,8 @@
 	// The plug-in ID
 	public static final String PLUGIN_ID = "com.nokia.carbide.cpp.ui";
 
+	private static final String CARBIDE_IDE_FEATURE = "CARBIDE_IDE"; //$NON-NLS-1$
+
 	// The shared instance
 	private static CarbideUIPlugin plugin;
 	
@@ -50,6 +53,8 @@
 	 */
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
+
+		FeatureUseTrackerPlugin.getFeatureUseProxy().useFeature(CARBIDE_IDE_FEATURE);
 	}
 
 	/*

--- a/core/com.nokia.carbide.cpp/META-INF/MANIFEST.MF	Tue Aug 31 17:03:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp/META-INF/MANIFEST.MF	Tue Aug 31 18:54:57 2010 -0500
@@ -15,8 +15,7 @@
  org.eclipse.ui.ide,
  org.eclipse.cdt.core,
  com.nokia.carbide.discovery.ui;bundle-version="1.0.0",
- org.eclipse.equinox.p2.ui;bundle-version="2.0.0",
- com.nokia.carbide.cpp.featureTracker
+ org.eclipse.equinox.p2.ui;bundle-version="2.0.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: com.nokia.carbide.cpp,
  com.nokia.carbide.cpp.logging

--- a/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/ProductPlugin.java	Tue Aug 31 17:03:48 2010 -0500
+++ b/core/com.nokia.carbide.cpp/src/com/nokia/carbide/cpp/ProductPlugin.java	Tue Aug 31 18:54:57 2010 -0500
@@ -22,7 +22,6 @@
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
-import com.nokia.carbide.cpp.internal.featureTracker.FeatureUseTrackerPlugin;
 import com.nokia.carbide.internal.discovery.ui.wizard.P2Utils;
 
 /**
@@ -30,8 +29,6 @@
  */
 public class ProductPlugin extends AbstractUIPlugin {
 
-	private static final String CARBIDE_IDE_FEATURE = "CARBIDE_IDE"; //$NON-NLS-1$
-	
 	//The shared instance.
 	private static ProductPlugin plugin;
 	
@@ -47,12 +44,11 @@
 	 */
 	public void start(BundleContext context) throws Exception {
 		super.start(context);
+
 		File file = P2Utils.getInitialFeaturesFile();
 		if (!file.exists()) {
 			P2Utils.writeFeaturesToFile(file);
 		}
-
-		FeatureUseTrackerPlugin.getFeatureUseProxy().useFeature(CARBIDE_IDE_FEATURE);
 	}
 
 	/**