diff --git a/plugins/org.eclipse.tm.terminal.connector.local/.project b/plugins/org.eclipse.tm.terminal.connector.local/.project
index 9a13c2acf9c..696a343153f 100644
--- a/plugins/org.eclipse.tm.terminal.connector.local/.project
+++ b/plugins/org.eclipse.tm.terminal.connector.local/.project
@@ -20,10 +20,16 @@
 			<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>
 	<filteredResources>
 		<filter>
diff --git a/plugins/org.eclipse.tm.terminal.connector.process/.project b/plugins/org.eclipse.tm.terminal.connector.process/.project
index f609200e524..92d9bc9fd90 100644
--- a/plugins/org.eclipse.tm.terminal.connector.process/.project
+++ b/plugins/org.eclipse.tm.terminal.connector.process/.project
@@ -20,10 +20,16 @@
 			<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>
 	<filteredResources>
 		<filter>
diff --git a/plugins/org.eclipse.tm.terminal.connector.serial/.project b/plugins/org.eclipse.tm.terminal.connector.serial/.project
index c64fbf0aa95..f7f32b28ecd 100644
--- a/plugins/org.eclipse.tm.terminal.connector.serial/.project
+++ b/plugins/org.eclipse.tm.terminal.connector.serial/.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/plugins/org.eclipse.tm.terminal.connector.ssh/.project b/plugins/org.eclipse.tm.terminal.connector.ssh/.project
index 55858db534c..be963dbfb21 100644
--- a/plugins/org.eclipse.tm.terminal.connector.ssh/.project
+++ b/plugins/org.eclipse.tm.terminal.connector.ssh/.project
@@ -20,10 +20,16 @@
 			<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>
 	<filteredResources>
 		<filter>
diff --git a/plugins/org.eclipse.tm.terminal.connector.telnet/.project b/plugins/org.eclipse.tm.terminal.connector.telnet/.project
index 7a745829ff7..83045227a60 100644
--- a/plugins/org.eclipse.tm.terminal.connector.telnet/.project
+++ b/plugins/org.eclipse.tm.terminal.connector.telnet/.project
@@ -20,10 +20,16 @@
 			<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>
 	<filteredResources>
 		<filter>
diff --git a/plugins/org.eclipse.tm.terminal.control/META-INF/MANIFEST.MF b/plugins/org.eclipse.tm.terminal.control/META-INF/MANIFEST.MF
index c365978ebfd..99aabb4e350 100644
--- a/plugins/org.eclipse.tm.terminal.control/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tm.terminal.control/META-INF/MANIFEST.MF
@@ -19,17 +19,7 @@ Export-Package: org.eclipse.tm.internal.terminal.connector;x-friends:="org.eclip
  org.eclipse.tm.internal.terminal.emulator;x-friends:="org.eclipse.tm.terminal.test",
  org.eclipse.tm.internal.terminal.model;x-friends:="org.eclipse.tm.terminal.test",
  org.eclipse.tm.internal.terminal.preferences,
- org.eclipse.tm.internal.terminal.provisional.api;
-  x-friends:="org.eclipse.tm.terminal.connector.serial,
-   org.eclipse.tm.terminal.connector.ssh,
-   org.eclipse.tm.terminal.connector.telnet,
-   org.eclipse.tm.terminal.connector.local,
-   org.eclipse.tm.terminal.test",
- org.eclipse.tm.internal.terminal.provisional.api.provider;
-  x-friends:="org.eclipse.tm.terminal.connector.serial,
-   org.eclipse.tm.terminal.connector.ssh,
-   org.eclipse.tm.terminal.connector.telnet,
-   org.eclipse.tm.terminal.connector.local,
-   org.eclipse.tm.terminal.test",
+ org.eclipse.tm.internal.terminal.provisional.api,
+ org.eclipse.tm.internal.terminal.provisional.api.provider,
  org.eclipse.tm.internal.terminal.textcanvas;x-friends:="org.eclipse.tm.terminal.test",
  org.eclipse.tm.terminal.model
diff --git a/plugins/org.eclipse.tm.terminal.view.core/.project b/plugins/org.eclipse.tm.terminal.view.core/.project
index 82e91af353c..f6e4e7e96a0 100644
--- a/plugins/org.eclipse.tm.terminal.view.core/.project
+++ b/plugins/org.eclipse.tm.terminal.view.core/.project
@@ -20,10 +20,16 @@
 			<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>
 	<filteredResources>
 		<filter>
diff --git a/plugins/org.eclipse.tm.terminal.view.ui.rse/.project b/plugins/org.eclipse.tm.terminal.view.ui.rse/.project
index c0a42945343..2d1d0bcfb50 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui.rse/.project
+++ b/plugins/org.eclipse.tm.terminal.view.ui.rse/.project
@@ -20,10 +20,16 @@
 			<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>
 	<filteredResources>
 		<filter>
diff --git a/plugins/org.eclipse.tm.terminal.view.ui/.project b/plugins/org.eclipse.tm.terminal.view.ui/.project
index a663c982f5c..3686758258d 100644
--- a/plugins/org.eclipse.tm.terminal.view.ui/.project
+++ b/plugins/org.eclipse.tm.terminal.view.ui/.project
@@ -20,10 +20,16 @@
 			<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>
 	<filteredResources>
 		<filter>