diff --git a/source/java/org/alfresco/repo/audit/extractor/AbstractDataExtractor.java b/source/java/org/alfresco/repo/audit/extractor/AbstractDataExtractor.java
index ad9ad87b28..0b28a9c058 100644
--- a/source/java/org/alfresco/repo/audit/extractor/AbstractDataExtractor.java
+++ b/source/java/org/alfresco/repo/audit/extractor/AbstractDataExtractor.java
@@ -18,6 +18,7 @@
  */
 package org.alfresco.repo.audit.extractor;
 
+import org.alfresco.api.AlfrescoPublicApi;     
 import org.alfresco.util.PropertyCheck;
 import org.alfresco.util.registry.NamedObjectRegistry;
 import org.apache.commons.logging.Log;
@@ -31,6 +32,7 @@ import org.springframework.beans.factory.InitializingBean;
  * @author Derek Hulley
  * @since 3.2
  */
+@AlfrescoPublicApi
 public abstract class AbstractDataExtractor implements DataExtractor, InitializingBean, BeanNameAware
 {
     /** Logger that can be used by subclasses */
diff --git a/source/java/org/alfresco/repo/audit/extractor/DataExtractor.java b/source/java/org/alfresco/repo/audit/extractor/DataExtractor.java
index fd5221a5a5..c934a50f23 100644
--- a/source/java/org/alfresco/repo/audit/extractor/DataExtractor.java
+++ b/source/java/org/alfresco/repo/audit/extractor/DataExtractor.java
@@ -20,6 +20,8 @@ package org.alfresco.repo.audit.extractor;
 
 import java.io.Serializable;
 
+import org.alfresco.api.AlfrescoPublicApi;   
+
 /**
  * Interface for Audit data value extractors.  These are used to extract auditable values
  * from those arguments, return values, exceptions and any other value passed into the audit
@@ -32,6 +34,7 @@ import java.io.Serializable;
  * @author Derek Hulley
  * @since 3.2
  */
+@AlfrescoPublicApi
 public interface DataExtractor
 {
     /**
diff --git a/source/java/org/alfresco/repo/audit/generator/AbstractDataGenerator.java b/source/java/org/alfresco/repo/audit/generator/AbstractDataGenerator.java
index d8cc2cc17e..49a9490649 100644
--- a/source/java/org/alfresco/repo/audit/generator/AbstractDataGenerator.java
+++ b/source/java/org/alfresco/repo/audit/generator/AbstractDataGenerator.java
@@ -18,6 +18,7 @@
  */
 package org.alfresco.repo.audit.generator;
 
+import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.util.PropertyCheck;
 import org.alfresco.util.registry.NamedObjectRegistry;
 import org.apache.commons.logging.Log;
@@ -31,6 +32,7 @@ import org.springframework.beans.factory.InitializingBean;
  * @author Derek Hulley
  * @since 3.2
  */
+@AlfrescoPublicApi
 public abstract class AbstractDataGenerator implements DataGenerator, InitializingBean, BeanNameAware
 {
     /** Logger that can be used by subclasses */
diff --git a/source/java/org/alfresco/repo/audit/generator/DataGenerator.java b/source/java/org/alfresco/repo/audit/generator/DataGenerator.java
index 0601cabf65..17468ab03b 100644
--- a/source/java/org/alfresco/repo/audit/generator/DataGenerator.java
+++ b/source/java/org/alfresco/repo/audit/generator/DataGenerator.java
@@ -20,6 +20,8 @@ package org.alfresco.repo.audit.generator;
 
 import java.io.Serializable;
 
+import org.alfresco.api.AlfrescoPublicApi;   
+
 /**
  * Interface for Audit data value generators.These are used to produce auditable data values
  * extract auditable values from nothing; typically these values are derived from the system
@@ -30,6 +32,7 @@ import java.io.Serializable;
  * @author Derek Hulley
  * @since 3.2
  */
+@AlfrescoPublicApi
 public interface DataGenerator
 {
     /**