--- a/core/com.nokia.carbide.templatewizard/src/com/nokia/carbide/template/engine/ILoadedTemplate.java	Thu Jul 09 14:12:22 2009 -0500
+++ b/core/com.nokia.carbide.templatewizard/src/com/nokia/carbide/template/engine/ILoadedTemplate.java	Thu Jul 09 14:16:25 2009 -0500
@@ -25,8 +25,9 @@
 
 /**
  * This interface, available through {@link ITemplate#getLoadedTemplate()},
- * provides the runtime model for template XML and a way to create its UI.  
+ * provides the runtime model for template XML and a way to create its UI. 
  * @since 2.1
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ILoadedTemplate {
 	/**

--- a/core/com.nokia.carbide.templatewizard/src/com/nokia/carbide/template/engine/ILoadedTemplateUI.java	Thu Jul 09 14:12:22 2009 -0500
+++ b/core/com.nokia.carbide.templatewizard/src/com/nokia/carbide/template/engine/ILoadedTemplateUI.java	Thu Jul 09 14:16:25 2009 -0500
@@ -36,6 +36,7 @@
  * is called to initialize from persisted storage.
  * @since 2.1
  *
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ILoadedTemplateUI {
 	/**

--- a/core/com.nokia.carbide.templatewizard/src/com/nokia/carbide/template/engine/IPersistedSettingStorage.java	Thu Jul 09 14:12:22 2009 -0500
+++ b/core/com.nokia.carbide.templatewizard/src/com/nokia/carbide/template/engine/IPersistedSettingStorage.java	Thu Jul 09 14:16:25 2009 -0500
@@ -24,6 +24,7 @@
  * the persisted settings to a client-implemented store. 
  * @since 2.1
  *
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IPersistedSettingStorage {
 	/**

--- a/core/com.nokia.carbide.templatewizard/src/com/nokia/carbide/template/engine/ITemplate.java	Thu Jul 09 14:12:22 2009 -0500
+++ b/core/com.nokia.carbide.templatewizard/src/com/nokia/carbide/template/engine/ITemplate.java	Thu Jul 09 14:16:25 2009 -0500
@@ -30,6 +30,8 @@
 /**
  * Runtime access for the metadata of a single template in a 
  * <i>com.nokia.carbide.templatewizard.wizardTemplate</i> extension.
+ * 
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ITemplate {
 

--- a/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/cpp/epoc/engine/model/PKGModelFactory.java	Thu Jul 09 14:12:22 2009 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/cpp/epoc/engine/model/PKGModelFactory.java	Thu Jul 09 14:16:25 2009 -0500
@@ -18,6 +18,7 @@
 
 package com.nokia.carbide.cpp.epoc.engine.model;
 
+import com.nokia.carbide.cpp.epoc.engine.EpocEnginePlugin;
 import com.nokia.carbide.internal.api.cpp.epoc.engine.model.pkg.IPKGOwnedModel;
 import com.nokia.carbide.internal.cpp.epoc.engine.model.pkg.PKGModel;
 

--- a/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/cpp/epoc/engine/model/bldinf/IExtension.java	Thu Jul 09 14:12:22 2009 -0500
+++ b/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/cpp/epoc/engine/model/bldinf/IExtension.java	Thu Jul 09 14:16:25 2009 -0500
@@ -28,7 +28,8 @@
  * It's recommended to use a utility class (like BldInfViewPathHelpers) to interpret
  * and set the paths in this extension and resolve paths to actual project or filesystem
  * files.
- *
+ * 
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IExtension {
 	/** Check whether the template path is set. */
@@ -53,10 +54,12 @@
 	/** Access/modify the list of dependencies.  No interpretation is performed.  As in the bld.inf, no extension will be present. */
 	List<IPath> getDependencies();
 	
-	/** Get the name associated with the extension, may be null for unnamed extension */
+	/** Get the name associated with the extension, may be null for unnamed extension
+	 * @since 2.1 */
 	String getName();
 	
-	/** Set the name associated with the extension, may be null for unnamed extension */
+	/** Set the name associated with the extension, may be null for unnamed extension
+	 * @since 2.1 */
 	void setName(String name);
 	
 	/** Get the tool name, may be null */