diff --git a/source/java/org/alfresco/repo/module/ModuleComponent.java b/source/java/org/alfresco/repo/module/ModuleComponent.java
index 058def40cf..9920980cca 100644
--- a/source/java/org/alfresco/repo/module/ModuleComponent.java
+++ b/source/java/org/alfresco/repo/module/ModuleComponent.java
@@ -20,6 +20,7 @@ package org.alfresco.repo.module;
 
 import java.util.List;
 
+import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.util.VersionNumber;
 
 /**
@@ -34,6 +35,7 @@ import org.alfresco.util.VersionNumber;
  * @author Derek Hulley
  * @since 2.0
  */
+@AlfrescoPublicApi
 public interface ModuleComponent
 {
     /**
diff --git a/source/java/org/alfresco/service/cmr/module/ModuleDependency.java b/source/java/org/alfresco/service/cmr/module/ModuleDependency.java
index 1fe742410a..b0563dc2da 100644
--- a/source/java/org/alfresco/service/cmr/module/ModuleDependency.java
+++ b/source/java/org/alfresco/service/cmr/module/ModuleDependency.java
@@ -20,6 +20,8 @@ package org.alfresco.service.cmr.module;
 
 import java.io.Serializable;
 
+import org.alfresco.api.AlfrescoPublicApi;
+
 /**
  * An ensapsulated module dependency.  Since module dependencies may be range based and even
  * unbounded, it is not possible to describe a dependency using a list of module version numbers.
@@ -27,6 +29,7 @@ import java.io.Serializable;
  * 
  * @author Derek Hulley
  */
+@AlfrescoPublicApi
 public interface ModuleDependency extends Serializable
 {
     /**
diff --git a/source/java/org/alfresco/service/cmr/module/ModuleDetails.java b/source/java/org/alfresco/service/cmr/module/ModuleDetails.java
index 4e024f623b..f7b34993ff 100644
--- a/source/java/org/alfresco/service/cmr/module/ModuleDetails.java
+++ b/source/java/org/alfresco/service/cmr/module/ModuleDetails.java
@@ -23,6 +23,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Properties;
 
+import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.util.VersionNumber;
 
 /**
@@ -31,6 +32,7 @@ import org.alfresco.util.VersionNumber;
  * @author Roy Wetherall
  * @since 2.0
  */
+@AlfrescoPublicApi
 public interface ModuleDetails extends Serializable
 {
     static final String PROP_ID = "module.id";
diff --git a/source/java/org/alfresco/service/cmr/module/ModuleInstallState.java b/source/java/org/alfresco/service/cmr/module/ModuleInstallState.java
index 6db22036ad..849e6c9800 100644
--- a/source/java/org/alfresco/service/cmr/module/ModuleInstallState.java
+++ b/source/java/org/alfresco/service/cmr/module/ModuleInstallState.java
@@ -18,11 +18,14 @@
  */
 package org.alfresco.service.cmr.module;
 
+import org.alfresco.api.AlfrescoPublicApi;
+
 /**
  * Enum used to indicate the install state of a module.
  * 
  * @author Roy Wetherall
  */
+@AlfrescoPublicApi
 public enum ModuleInstallState
 {
     /** The state of the module is unknown */
diff --git a/source/java/org/alfresco/service/cmr/module/ModuleService.java b/source/java/org/alfresco/service/cmr/module/ModuleService.java
index 582cd15650..969e8b9955 100644
--- a/source/java/org/alfresco/service/cmr/module/ModuleService.java
+++ b/source/java/org/alfresco/service/cmr/module/ModuleService.java
@@ -21,6 +21,7 @@ package org.alfresco.service.cmr.module;
 import java.util.List;
 import java.util.Map;
 
+import org.alfresco.api.AlfrescoPublicApi;
 import org.alfresco.repo.module.ModuleComponent;
 
 /**
@@ -30,6 +31,7 @@ import org.alfresco.repo.module.ModuleComponent;
  * @author Derek Hulley
  * @since 2.0
  */
+@AlfrescoPublicApi
 public interface ModuleService
 {
     /**