diff --git a/providers/bgp/cli/BUILD b/providers/bgp/cli/BUILD
index 3e909c9..5a6b1e6 100644
--- a/providers/bgp/cli/BUILD
+++ b/providers/bgp/cli/BUILD
@@ -1,5 +1,4 @@
 COMPILE_DEPS = CORE_DEPS + CLI + [
-    "//incubator/api:onos-incubator-api",
     "//providers/bgp/cfg:onos-providers-bgp-cfg",
     "//providers/bgp/topology:onos-providers-bgp-topology",
     "//protocols/bgp/api:onos-protocols-bgp-api",
diff --git a/providers/bgp/route/BUILD b/providers/bgp/route/BUILD
index 2966dd3..80d23a0 100644
--- a/providers/bgp/route/BUILD
+++ b/providers/bgp/route/BUILD
@@ -1,8 +1,6 @@
 COMPILE_DEPS = CORE_DEPS + [
     "//protocols/bgp/api:onos-protocols-bgp-api",
     "//protocols/bgp/bgpio:onos-protocols-bgp-bgpio",
-    "//incubator/store:onos-incubator-store",
-    "//incubator/api:onos-incubator-api",
     "//apps/evpn-route-service/api:onos-apps-evpn-route-service-api",
 ]
 
diff --git a/providers/bgp/topology/BUILD b/providers/bgp/topology/BUILD
index 65a90cd..9851523 100644
--- a/providers/bgp/topology/BUILD
+++ b/providers/bgp/topology/BUILD
@@ -1,8 +1,7 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + [
     "//protocols/bgp/api:onos-protocols-bgp-api",
     "//protocols/bgp/bgpio:onos-protocols-bgp-bgpio",
-    "//incubator/store:onos-incubator-store",
-    "//incubator/api:onos-incubator-api",
+    "//apps/tunnel/api:onos-apps-tunnel-api",
     "//apps/pcep-api:onos-apps-pcep-api",
 ]
 
diff --git a/providers/bgpcep/flow/BUILD b/providers/bgpcep/flow/BUILD
index 865db88..53c3dda0 100644
--- a/providers/bgpcep/flow/BUILD
+++ b/providers/bgpcep/flow/BUILD
@@ -1,6 +1,5 @@
 COMPILE_DEPS = CORE_DEPS + [
     "//protocols/bgp/api:onos-protocols-bgp-api",
-    "//incubator/api:onos-incubator-api",
     "//protocols/pcep/server/api:onos-protocols-pcep-server-api",
     "//protocols/pcep/pcepio:onos-protocols-pcep-pcepio",
 ]
diff --git a/providers/host/BUILD b/providers/host/BUILD
index 9d60d15..a1a2f47 100644
--- a/providers/host/BUILD
+++ b/providers/host/BUILD
@@ -1,6 +1,4 @@
-COMPILE_DEPS = CORE_DEPS + [
-    "//incubator/api:onos-incubator-api",
-]
+COMPILE_DEPS = CORE_DEPS
 
 TEST_DEPS = TEST_ADAPTERS + [
     "//utils/osgi:onlab-osgi-tests",
diff --git a/providers/hostprobing/BUILD b/providers/hostprobing/BUILD
index dc6b7a4..46ae87c 100644
--- a/providers/hostprobing/BUILD
+++ b/providers/hostprobing/BUILD
@@ -1,6 +1,4 @@
-COMPILE_DEPS = CORE_DEPS + [
-    "//incubator/api:onos-incubator-api",
-]
+COMPILE_DEPS = CORE_DEPS
 
 TEST_DEPS = TEST_ADAPTERS + [
     "//utils/osgi:onlab-osgi-tests",
diff --git a/providers/netconf/alarm/BUILD b/providers/netconf/alarm/BUILD
index e63c6f0..aa616d8 100644
--- a/providers/netconf/alarm/BUILD
+++ b/providers/netconf/alarm/BUILD
@@ -1,5 +1,4 @@
 COMPILE_DEPS = CORE_DEPS + [
-    "//incubator/api:onos-incubator-api",
     "//protocols/netconf/api:onos-protocols-netconf-api",
     "//protocols/netconf/ctl:onos-protocols-netconf-ctl",
 ]
diff --git a/providers/netconf/alarm/src/main/java/org/onosproject/provider/netconf/alarm/NetconfAlarmProvider.java b/providers/netconf/alarm/src/main/java/org/onosproject/provider/netconf/alarm/NetconfAlarmProvider.java
index 20420cd..d8bb0c7 100644
--- a/providers/netconf/alarm/src/main/java/org/onosproject/provider/netconf/alarm/NetconfAlarmProvider.java
+++ b/providers/netconf/alarm/src/main/java/org/onosproject/provider/netconf/alarm/NetconfAlarmProvider.java
@@ -23,12 +23,12 @@
 import org.osgi.service.component.annotations.Deactivate;
 import org.osgi.service.component.annotations.Reference;
 import org.osgi.service.component.annotations.ReferenceCardinality;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmProvider;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmProviderService;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmProviderRegistry;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmTranslator;
-import org.onosproject.incubator.net.faultmanagement.alarm.DeviceAlarmConfig;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmProvider;
+import org.onosproject.alarm.AlarmProviderService;
+import org.onosproject.alarm.AlarmProviderRegistry;
+import org.onosproject.alarm.AlarmTranslator;
+import org.onosproject.alarm.DeviceAlarmConfig;
 import org.onosproject.net.Device;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.device.DeviceService;
diff --git a/providers/netconf/alarm/src/main/java/org/onosproject/provider/netconf/alarm/NetconfAlarmTranslator.java b/providers/netconf/alarm/src/main/java/org/onosproject/provider/netconf/alarm/NetconfAlarmTranslator.java
index 05847e1..789ce56 100644
--- a/providers/netconf/alarm/src/main/java/org/onosproject/provider/netconf/alarm/NetconfAlarmTranslator.java
+++ b/providers/netconf/alarm/src/main/java/org/onosproject/provider/netconf/alarm/NetconfAlarmTranslator.java
@@ -17,11 +17,11 @@
 package org.onosproject.provider.netconf.alarm;
 
 import com.google.common.collect.ImmutableSet;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmId;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmTranslator;
-import org.onosproject.incubator.net.faultmanagement.alarm.DefaultAlarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.XmlEventParser;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmId;
+import org.onosproject.alarm.AlarmTranslator;
+import org.onosproject.alarm.DefaultAlarm;
+import org.onosproject.alarm.XmlEventParser;
 import org.onosproject.net.DeviceId;
 import org.slf4j.Logger;
 import org.w3c.dom.Document;
diff --git a/providers/netconf/device/BUILD b/providers/netconf/device/BUILD
index 173b548..a2b09c7 100644
--- a/providers/netconf/device/BUILD
+++ b/providers/netconf/device/BUILD
@@ -1,5 +1,4 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + [
-    "//incubator/api:onos-incubator-api",
     "//protocols/netconf/api:onos-protocols-netconf-api",
 ]
 
diff --git a/providers/ovsdb/tunnel/BUILD b/providers/ovsdb/tunnel/BUILD
index 362e9fe..68ef822 100644
--- a/providers/ovsdb/tunnel/BUILD
+++ b/providers/ovsdb/tunnel/BUILD
@@ -1,7 +1,7 @@
 COMPILE_DEPS = CORE_DEPS + [
     "//protocols/ovsdb/api:onos-protocols-ovsdb-api",
     "//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc",
-    "//incubator/api:onos-incubator-api",
+    "//apps/tunnel/api:onos-apps-tunnel-api",
 ]
 
 osgi_jar_with_tests(
diff --git a/providers/pcep/cli/BUILD b/providers/pcep/cli/BUILD
index ff1e7ad..4eac8a7 100644
--- a/providers/pcep/cli/BUILD
+++ b/providers/pcep/cli/BUILD
@@ -1,5 +1,4 @@
 COMPILE_DEPS = CORE_DEPS + CLI + [
-    "//incubator/api:onos-incubator-api",
     "//protocols/pcep/server/ctl:onos-protocols-pcep-server-ctl",
     "//protocols/pcep/server/api:onos-protocols-pcep-server-api",
 ]
diff --git a/providers/pcep/topology/BUILD b/providers/pcep/topology/BUILD
index ec3e0d6..753bb67 100644
--- a/providers/pcep/topology/BUILD
+++ b/providers/pcep/topology/BUILD
@@ -1,6 +1,5 @@
 COMPILE_DEPS = CORE_DEPS + NETTY + JACKSON + [
     "@io_netty_netty//jar",
-    "//incubator/api:onos-incubator-api",
     "//protocols/ovsdb/api:onos-protocols-ovsdb-api",
     "//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc",
     "//apps/pcep-api:onos-apps-pcep-api",
diff --git a/providers/pcep/tunnel/BUILD b/providers/pcep/tunnel/BUILD
index 7123001..c28460d 100644
--- a/providers/pcep/tunnel/BUILD
+++ b/providers/pcep/tunnel/BUILD
@@ -2,7 +2,7 @@
     "//protocols/ovsdb/api:onos-protocols-ovsdb-api",
     "//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc",
     "//apps/pcep-api:onos-apps-pcep-api",
-    "//incubator/api:onos-incubator-api",
+    "//apps/tunnel/api:onos-apps-tunnel-api",
     "//protocols/pcep/pcepio:onos-protocols-pcep-pcepio",
     "//protocols/pcep/server/api:onos-protocols-pcep-server-api",
     "//protocols/pcep/server/ctl:onos-protocols-pcep-server-ctl",
@@ -13,7 +13,7 @@
     "@io_netty_netty_transport//jar",
     "//protocols/pcep/server/api:onos-protocols-pcep-server-api-tests",
     "//apps/pcep-api:onos-apps-pcep-api-tests",
-    "//incubator/api:onos-incubator-api-tests",
+    "//apps/tunnel/api:onos-apps-tunnel-api-tests",
 ]
 
 osgi_jar_with_tests(
diff --git a/providers/rest/device/BUILD b/providers/rest/device/BUILD
index 9c17e2f..c1fece8 100644
--- a/providers/rest/device/BUILD
+++ b/providers/rest/device/BUILD
@@ -3,7 +3,6 @@
     #"//protocols/ovsdb/api:onos-protocols-ovsdb-api",
     #"//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc",
     #"//apps/pcep-api:onos-apps-pcep-api",
-    "//incubator/api:onos-incubator-api",
     "//protocols/rest/api:onos-protocols-rest-api",
 ]
 
diff --git a/providers/snmp/alarm/BUILD b/providers/snmp/alarm/BUILD
index bb9de5c..3546651 100644
--- a/providers/snmp/alarm/BUILD
+++ b/providers/snmp/alarm/BUILD
@@ -1,6 +1,5 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + [
     "@org_apache_servicemix_bundles_snmp4j//jar",
-    "//incubator/api:onos-incubator-api",
     "//protocols/snmp/api:onos-protocols-snmp-api",
     "//protocols/snmp/ctl:onos-protocols-snmp-ctl",
     "//providers/snmp/device:onos-providers-snmp-device",
diff --git a/providers/snmp/alarm/src/main/java/org/onosproject/provider/snmp/alarm/impl/SnmpAlarmProvider.java b/providers/snmp/alarm/src/main/java/org/onosproject/provider/snmp/alarm/impl/SnmpAlarmProvider.java
index 1b29e00..1baa760 100644
--- a/providers/snmp/alarm/src/main/java/org/onosproject/provider/snmp/alarm/impl/SnmpAlarmProvider.java
+++ b/providers/snmp/alarm/src/main/java/org/onosproject/provider/snmp/alarm/impl/SnmpAlarmProvider.java
@@ -27,11 +27,11 @@
 import org.onosproject.cluster.ClusterService;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmProvider;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmProviderRegistry;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmProviderService;
-import org.onosproject.incubator.net.faultmanagement.alarm.DeviceAlarmConfig;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmProvider;
+import org.onosproject.alarm.AlarmProviderRegistry;
+import org.onosproject.alarm.AlarmProviderService;
+import org.onosproject.alarm.DeviceAlarmConfig;
 import org.onosproject.mastership.MastershipEvent;
 import org.onosproject.mastership.MastershipListener;
 import org.onosproject.mastership.MastershipService;
diff --git a/providers/snmp/device/BUILD b/providers/snmp/device/BUILD
index 95dc777..766f0b7 100644
--- a/providers/snmp/device/BUILD
+++ b/providers/snmp/device/BUILD
@@ -3,7 +3,6 @@
     "@snmp_core//jar",
     "@mibs_net_snmp//jar",
     "@mibs_rfc//jar",
-    "//incubator/api:onos-incubator-api",
     "//protocols/snmp/api:onos-protocols-snmp-api",
     "//protocols/snmp/ctl:onos-protocols-snmp-ctl",
 ]
diff --git a/providers/snmp/device/src/test/java/org/onosproject/provider/snmp/device/impl/SnmpControllerAdapter.java b/providers/snmp/device/src/test/java/org/onosproject/provider/snmp/device/impl/SnmpControllerAdapter.java
index aab7818..5a476f0 100644
--- a/providers/snmp/device/src/test/java/org/onosproject/provider/snmp/device/impl/SnmpControllerAdapter.java
+++ b/providers/snmp/device/src/test/java/org/onosproject/provider/snmp/device/impl/SnmpControllerAdapter.java
@@ -17,7 +17,7 @@
 package org.onosproject.provider.snmp.device.impl;
 
 import com.btisystems.pronx.ems.core.snmp.ISnmpSession;
-import org.onosproject.incubator.net.faultmanagement.alarm.DefaultAlarm;
+import org.onosproject.alarm.DefaultAlarm;
 import org.onosproject.net.DeviceId;
 import org.onosproject.snmp.SnmpController;
 import org.onosproject.snmp.SnmpDevice;
diff --git a/providers/tl1/device/BUILD b/providers/tl1/device/BUILD
index f04769b..019e684 100644
--- a/providers/tl1/device/BUILD
+++ b/providers/tl1/device/BUILD
@@ -1,5 +1,4 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + [
-    "//incubator/api:onos-incubator-api",
     "//protocols/tl1/api:onos-protocols-tl1-api",
 ]