diff --git a/org.eclipse.wst.common.snippets/.project b/org.eclipse.wst.common.snippets/.project
index 7543a0c..e45c621 100644
--- a/org.eclipse.wst.common.snippets/.project
+++ b/org.eclipse.wst.common.snippets/.project
@@ -20,9 +20,15 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
 	</natures>
 </projectDescription>
diff --git a/org.eclipse.wst.common.snippets/component.xml b/org.eclipse.wst.common.snippets/component.xml
deleted file mode 100644
index 81f2174..0000000
--- a/org.eclipse.wst.common.snippets/component.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.wst.common.snippets">
-	<component-depends unrestricted="true" />
-	<plugin id="org.eclipse.wst.common.snippets" fragment="false" />
-	<description url="http://eclipse.org/webtools/wst/components/common/overview/snippets/overview.html" />
-	<package name="org.eclipse.wst.common.snippets.core">
-		<type name="ISnippetCategory" implement="false" />
-		<type name="ISnippetEntry" implement="false" />
-		<type name="ISnippetItem" implement="false" />
-		<type name="ISnippetVariable" implement="false" />
-	</package>
-	<package name="org.eclipse.wst.common.snippets.ui" api="false">
-		<type name="DefaultSnippetInsertion" subclass="true" instantiate="true" />
-		<type name="ISnippetInsertion" implement="false" />
-	</package>
-</component>
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetCategory.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetCategory.java
index c4024de..e6d08e8 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetCategory.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetCategory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2012 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -16,6 +16,7 @@
  * Clients are not intended to implement this interface.
  * </p>
  * @since 1.0
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ISnippetCategory extends ISnippetsEntry {
 	/**
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetItem.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetItem.java
index 4604615..f0e5a09 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetItem.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetItem.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2012 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,6 +17,7 @@
  * Clients are not intended to implement this interface.
  * </p>
  * @since 1.0
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ISnippetItem extends ISnippetsEntry {
 	/**
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetVariable.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetVariable.java
index a6abab5..3236725 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetVariable.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/core/ISnippetVariable.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2012 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -17,6 +17,7 @@
  * Clients are not intended to implement this interface.
  * </p>
  * @since 1.0
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ISnippetVariable {
 	/**
diff --git a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/ui/ISnippetInsertion.java b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/ui/ISnippetInsertion.java
index 91b0843..2bd0679 100644
--- a/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/ui/ISnippetInsertion.java
+++ b/org.eclipse.wst.common.snippets/src/org/eclipse/wst/common/snippets/ui/ISnippetInsertion.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2012 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@
  * Clients may implement this interface.
  * </p>
  * @since 1.0
+ * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface ISnippetInsertion {