Index: oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/NameMapper.java
===================================================================
--- oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/NameMapper.java	(revision 1816535)
+++ oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/NameMapper.java	(working copy)
@@ -22,9 +22,12 @@
 import javax.annotation.Nonnull;
 import javax.jcr.RepositoryException;
 
+import org.osgi.annotation.versioning.ProviderType;
+
 /**
  * TODO document
  */
+@ProviderType
 public interface NameMapper {
 
     /**
Index: oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/NamePathMapper.java
===================================================================
--- oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/NamePathMapper.java	(revision 1816535)
+++ oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/NamePathMapper.java	(working copy)
@@ -22,10 +22,13 @@
 import javax.annotation.Nonnull;
 import javax.jcr.RepositoryException;
 
+import org.osgi.annotation.versioning.ProviderType;
+
 /**
  * The {@code NamePathMapper} interface combines {@code NameMapper} and
  * {@code PathMapper}.
  */
+@ProviderType
 public interface NamePathMapper extends NameMapper, PathMapper {
 
     NamePathMapper DEFAULT = new Default();
Index: oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/PathMapper.java
===================================================================
--- oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/PathMapper.java	(revision 1816535)
+++ oak-core-spi/src/main/java/org/apache/jackrabbit/oak/namepath/PathMapper.java	(working copy)
@@ -19,6 +19,8 @@
 import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
+import org.osgi.annotation.versioning.ProviderType;
+
 /**
  * {@code PathMapper} instances provide methods for mapping paths from their JCR
  * string representation to their Oak representation and vice versa.
@@ -27,6 +29,7 @@
  * names of the respective items in the {@link org.apache.jackrabbit.oak.api.Tree}
  * separated by forward slashes.
  */
+@ProviderType
 public interface PathMapper {
 
     /**
Index: oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/DefinitionProvider.java
===================================================================
--- oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/DefinitionProvider.java	(revision 1816535)
+++ oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/DefinitionProvider.java	(working copy)
@@ -24,10 +24,12 @@
 
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.api.Tree;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * DefinitionProvider... TODO
  */
+@ProviderType
 public interface DefinitionProvider {
 
     @Nonnull
Index: oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/EffectiveNodeType.java
===================================================================
--- oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/EffectiveNodeType.java	(revision 1816535)
+++ oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/EffectiveNodeType.java	(working copy)
@@ -25,7 +25,9 @@
 
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.api.Tree;
+import org.osgi.annotation.versioning.ProviderType;
 
+@ProviderType
 public interface EffectiveNodeType {
     boolean includesNodeType(String nodeTypeName);
 
Index: oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/EffectiveNodeTypeProvider.java
===================================================================
--- oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/EffectiveNodeTypeProvider.java	(revision 1816535)
+++ oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/nodetype/EffectiveNodeTypeProvider.java	(working copy)
@@ -23,10 +23,12 @@
 import javax.jcr.nodetype.NoSuchNodeTypeException;
 
 import org.apache.jackrabbit.oak.api.Tree;
+import org.osgi.annotation.versioning.ProviderType;
 
 /**
  * EffectiveNodeTypeProvider... TODO
  */
+@ProviderType
 public interface EffectiveNodeTypeProvider {
 
     /**
Index: oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/Tracker.java
===================================================================
--- oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/Tracker.java	(revision 1816535)
+++ oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/Tracker.java	(working copy)
@@ -18,9 +18,12 @@
 
 import java.util.List;
 
+import org.osgi.annotation.versioning.ProviderType;
+
 /**
  * Tracker for whiteboard services.
  */
+@ProviderType
 public interface Tracker<T> {
 
     /**
Index: oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/Whiteboard.java
===================================================================
--- oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/Whiteboard.java	(revision 1816535)
+++ oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/whiteboard/Whiteboard.java	(working copy)
@@ -18,6 +18,9 @@
 
 import java.util.Map;
 
+import org.osgi.annotation.versioning.ProviderType;
+
+@ProviderType
 public interface Whiteboard {
 
     /**