diff --git a/source/java/org/alfresco/repo/action/executer/ActionExecuter.java b/source/java/org/alfresco/repo/action/executer/ActionExecuter.java
index cf0747a0ab..c9e4c9c121 100644
--- a/source/java/org/alfresco/repo/action/executer/ActionExecuter.java
+++ b/source/java/org/alfresco/repo/action/executer/ActionExecuter.java
@@ -18,6 +18,7 @@
  */
 package org.alfresco.repo.action.executer;
 
+import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.service.cmr.action.Action;
 import org.alfresco.service.cmr.action.ActionDefinition;
 import org.alfresco.service.cmr.repository.NodeRef;
@@ -27,6 +28,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
  * 
  * @author Roy Wetherall
  */
+@AlfrescoPublicApi
 public interface ActionExecuter
 {
 	/** Standard action result parameter name */
diff --git a/source/java/org/alfresco/repo/action/executer/ActionExecuterAbstractBase.java b/source/java/org/alfresco/repo/action/executer/ActionExecuterAbstractBase.java
index c86a5153e7..236975a573 100644
--- a/source/java/org/alfresco/repo/action/executer/ActionExecuterAbstractBase.java
+++ b/source/java/org/alfresco/repo/action/executer/ActionExecuterAbstractBase.java
@@ -21,6 +21,7 @@ package org.alfresco.repo.action.executer;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.repo.action.ActionDefinitionImpl;
 import org.alfresco.repo.action.ParameterizedItemAbstractBase;
 import org.alfresco.repo.lock.LockUtils;
@@ -41,6 +42,7 @@ import org.apache.commons.logging.LogFactory;
  * 
  * @author Roy Wetherall
  */
+@AlfrescoPublicApi
 public abstract class ActionExecuterAbstractBase extends ParameterizedItemAbstractBase implements ActionExecuter, LoggingAwareExecuter
 {
     private static Log logger = LogFactory.getLog(ActionExecuterAbstractBase.class);
diff --git a/source/java/org/alfresco/repo/content/AbstractContentStore.java b/source/java/org/alfresco/repo/content/AbstractContentStore.java
index 6d104b0f45..eb2dcefd7f 100644
--- a/source/java/org/alfresco/repo/content/AbstractContentStore.java
+++ b/source/java/org/alfresco/repo/content/AbstractContentStore.java
@@ -20,6 +20,7 @@ package org.alfresco.repo.content;
 
 import java.util.Date;
 
+import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.repo.content.ContentLimitProvider.NoLimitProvider;
 import org.alfresco.service.cmr.repository.ContentIOException;
 import org.alfresco.service.cmr.repository.ContentReader;
@@ -36,14 +37,15 @@ import org.apache.commons.logging.LogFactory;
  * provided is the generation of new content URLs and the checking of
  * existing URLs.
  * <p>
- * Implementations must override either of the <b>getWriter</b> methods;
- * {@link #getWriter(ContentContext)} or {@link #getWriterInternal(ContentReader, String)}.
- * 
- * @see #getWriter(org.alfresco.repo.content.ContentContext)
- * @see #getWriterInternal(ContentReader, String)
- * 
- * @author Derek Hulley
+ * Implementations must override either of the <b>getWriter</b> methods;
+ * {@link #getWriter(ContentContext)} or {@link #getWriterInternal(ContentReader, String)}.
+ * 
+ * @see #getWriter(org.alfresco.repo.content.ContentContext)
+ * @see #getWriterInternal(ContentReader, String)
+ * 
+ * @author Derek Hulley
  */
+@AlfrescoPublicApi
 public abstract class AbstractContentStore implements ContentStore
 {
     private static Log logger = LogFactory.getLog(AbstractContentStore.class);
diff --git a/source/java/org/alfresco/repo/content/ContentServicePolicies.java b/source/java/org/alfresco/repo/content/ContentServicePolicies.java
index ba5be54d73..758b7677fd 100644
--- a/source/java/org/alfresco/repo/content/ContentServicePolicies.java
+++ b/source/java/org/alfresco/repo/content/ContentServicePolicies.java
@@ -62,6 +62,7 @@ public interface ContentServicePolicies
      * 
      * @since 3.2
      */
+    @AlfrescoPublicApi
     public interface OnContentPropertyUpdatePolicy extends ClassPolicy
     {
         public static final QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "onContentPropertyUpdate");
@@ -90,6 +91,7 @@ public interface ContentServicePolicies
      * 
      * This policy is fired when a content reader is requested for a node that has content.
      */
+    @AlfrescoPublicApi
     public interface OnContentReadPolicy extends ClassPolicy
     {
         public static final QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "onContentRead");
diff --git a/source/java/org/alfresco/repo/content/filestore/FileContentStore.java b/source/java/org/alfresco/repo/content/filestore/FileContentStore.java
index 55d62a3948..e8f6864787 100644
--- a/source/java/org/alfresco/repo/content/filestore/FileContentStore.java
+++ b/source/java/org/alfresco/repo/content/filestore/FileContentStore.java
@@ -27,6 +27,7 @@ import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.Map;
 
+import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.repo.content.AbstractContentStore;
 import org.alfresco.repo.content.ContentContext;
@@ -64,6 +65,7 @@ import org.springframework.context.event.ContextRefreshedEvent;
  * 
  * @author Derek Hulley
  */
+@AlfrescoPublicApi
 public class FileContentStore
         extends AbstractContentStore
         implements ApplicationContextAware, ApplicationListener<ApplicationEvent>
diff --git a/source/java/org/alfresco/repo/copy/CopyServicePolicies.java b/source/java/org/alfresco/repo/copy/CopyServicePolicies.java
index dc93fea044..0a3e8fc6e4 100644
--- a/source/java/org/alfresco/repo/copy/CopyServicePolicies.java
+++ b/source/java/org/alfresco/repo/copy/CopyServicePolicies.java
@@ -97,6 +97,7 @@ public interface CopyServicePolicies
      * <p>
      * <b>Note: </b> A 'class' is either a type or an aspect.
      */
+    @AlfrescoPublicApi
     public interface OnCopyNodePolicy extends ClassPolicy
     {
         public static final QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "getCopyCallback");
diff --git a/source/java/org/alfresco/repo/forms/processor/Filter.java b/source/java/org/alfresco/repo/forms/processor/Filter.java
index 292d07788a..4470b70846 100644
--- a/source/java/org/alfresco/repo/forms/processor/Filter.java
+++ b/source/java/org/alfresco/repo/forms/processor/Filter.java
@@ -21,6 +21,7 @@ package org.alfresco.repo.forms.processor;
 import java.util.List;
 import java.util.Map;
 
+import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.repo.forms.Form;
 import org.alfresco.repo.forms.FormData;
 
@@ -30,6 +31,7 @@ import org.alfresco.repo.forms.FormData;
  *
  * @author Gavin Cornwell
  */
+@AlfrescoPublicApi
 public interface Filter<ItemType, PersistType>
 {
     /**
diff --git a/source/java/org/alfresco/repo/forms/processor/FormProcessor.java b/source/java/org/alfresco/repo/forms/processor/FormProcessor.java
index a63c503698..6c5ed08d8d 100644
--- a/source/java/org/alfresco/repo/forms/processor/FormProcessor.java
+++ b/source/java/org/alfresco/repo/forms/processor/FormProcessor.java
@@ -21,6 +21,7 @@ package org.alfresco.repo.forms.processor;
 import java.util.List;
 import java.util.Map;
 
+import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.repo.forms.Form;
 import org.alfresco.repo.forms.FormData;
 import org.alfresco.repo.forms.Item;
@@ -33,6 +34,7 @@ import org.alfresco.repo.forms.Item;
  *
  * @author Gavin Cornwell
  */
+@AlfrescoPublicApi
 public interface FormProcessor
 {
     /**
diff --git a/source/java/org/alfresco/repo/rating/AbstractRatingRollupAlgorithm.java b/source/java/org/alfresco/repo/rating/AbstractRatingRollupAlgorithm.java
index 97a361edb7..087e552734 100644
--- a/source/java/org/alfresco/repo/rating/AbstractRatingRollupAlgorithm.java
+++ b/source/java/org/alfresco/repo/rating/AbstractRatingRollupAlgorithm.java
@@ -21,6 +21,7 @@ package org.alfresco.repo.rating;
 
 import java.io.Serializable;
 
+import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.service.cmr.rating.RatingService;
 import org.alfresco.service.cmr.rating.RatingServiceException;
 import org.alfresco.service.cmr.repository.NodeRef;
@@ -40,6 +41,7 @@ import org.springframework.beans.factory.InitializingBean;
  * @author Neil McErlean
  * @since 3.5
  */
+@AlfrescoPublicApi
 public abstract class AbstractRatingRollupAlgorithm implements InitializingBean
 {
     protected String ratingSchemeName;
diff --git a/source/java/org/alfresco/repo/template/BaseTemplateProcessorExtension.java b/source/java/org/alfresco/repo/template/BaseTemplateProcessorExtension.java
index 8929026f5d..55c5500ff6 100644
--- a/source/java/org/alfresco/repo/template/BaseTemplateProcessorExtension.java
+++ b/source/java/org/alfresco/repo/template/BaseTemplateProcessorExtension.java
@@ -18,6 +18,7 @@
  */
 package org.alfresco.repo.template;
 
+import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.repo.processor.BaseProcessorExtension;
 import org.alfresco.service.cmr.repository.TemplateProcessorExtension;
 import org.alfresco.service.cmr.repository.TemplateImageResolver;
@@ -27,6 +28,7 @@ import org.alfresco.service.cmr.repository.TemplateImageResolver;
  * 
  * @author Kevin Roast
  */
+@AlfrescoPublicApi
 public abstract class BaseTemplateProcessorExtension extends BaseProcessorExtension implements TemplateProcessorExtension
 {   
     /** The TemplateImageResolver for the current template execution thread */
diff --git a/source/java/org/alfresco/repo/version/VersionServicePolicies.java b/source/java/org/alfresco/repo/version/VersionServicePolicies.java
index fbe14cee51..37097a13a5 100644
--- a/source/java/org/alfresco/repo/version/VersionServicePolicies.java
+++ b/source/java/org/alfresco/repo/version/VersionServicePolicies.java
@@ -72,6 +72,7 @@ public interface VersionServicePolicies
 	/**
 	 * On create version policy interface
 	 */
+	@AlfrescoPublicApi
 	public interface OnCreateVersionPolicy extends ClassPolicy
 	{
         public static final QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "onCreateVersion");
@@ -96,8 +97,8 @@ public interface VersionServicePolicies
 				Map<String, Serializable> versionProperties,
 				PolicyScope nodeDetails);
 	}
-	
 
+	@AlfrescoPublicApi
 	public interface OnRevertVersionPolicy extends ClassPolicy
 	{
         public static final QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "getRevertVersionCallback");
@@ -121,6 +122,7 @@ public interface VersionServicePolicies
 	/**
 	 * Calculate version lable policy interface
 	 */
+	@AlfrescoPublicApi
 	public interface CalculateVersionLabelPolicy extends ClassPolicy
 	{
 		public String calculateVersionLabel(
@@ -135,6 +137,7 @@ public interface VersionServicePolicies
      * After revert version policy interface
      *
      */
+	@AlfrescoPublicApi
     public interface AfterVersionRevertPolicy extends ClassPolicy
     {
         public static final QName QNAME = QName.createQName(NamespaceService.ALFRESCO_URI, "afterVersionRevert");
diff --git a/source/java/org/alfresco/service/cmr/rating/RatingScheme.java b/source/java/org/alfresco/service/cmr/rating/RatingScheme.java
index f17a06b982..57ee3d2a13 100644
--- a/source/java/org/alfresco/service/cmr/rating/RatingScheme.java
+++ b/source/java/org/alfresco/service/cmr/rating/RatingScheme.java
@@ -21,6 +21,7 @@ package org.alfresco.service.cmr.rating;
 
 import java.util.List;
 
+import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.repo.rating.AbstractRatingRollupAlgorithm;
 import org.alfresco.repo.rating.RatingNamingConventionsUtil;
 import org.alfresco.repo.rating.RatingSchemeRegistry;
@@ -35,6 +36,7 @@ import org.alfresco.repo.rating.RatingSchemeRegistry;
  * @author Neil McErlean
  * @since 3.4
  */
+@AlfrescoPublicApi
 public interface RatingScheme extends Comparable<RatingScheme>
 {
     /**