diff --git a/protocols/openflow/api/BUILD b/protocols/openflow/api/BUILD
index 3232c98..bc5f55a 100644
--- a/protocols/openflow/api/BUILD
+++ b/protocols/openflow/api/BUILD
@@ -1,6 +1,4 @@
 COMPILE_DEPS = CORE_DEPS + NETTY + [
-    "//incubator/store:onos-incubator-store",
-    "//incubator/api:onos-incubator-api",
     "//core/common:onos-core-common",
     "@openflowj//jar",
     "@io_netty_netty_transport//jar",
diff --git a/protocols/pcep/server/api/BUILD b/protocols/pcep/server/api/BUILD
index 604c1f3..0826d45 100644
--- a/protocols/pcep/server/api/BUILD
+++ b/protocols/pcep/server/api/BUILD
@@ -1,8 +1,8 @@
 COMPILE_DEPS = CORE_DEPS + [
     "@io_netty_netty//jar",
+    "//apps/tunnel/api:onos-apps-tunnel-api",
     "//protocols/pcep/pcepio:onos-protocols-pcep-pcepio",
     "//apps/pcep-api:onos-apps-pcep-api",
-    "//incubator/api:onos-incubator-api",
 ]
 
 osgi_jar_with_tests(
diff --git a/protocols/pcep/server/ctl/BUILD b/protocols/pcep/server/ctl/BUILD
index 463819f..f470e41 100644
--- a/protocols/pcep/server/ctl/BUILD
+++ b/protocols/pcep/server/ctl/BUILD
@@ -1,6 +1,6 @@
 COMPILE_DEPS = CORE_DEPS + NETTY + JACKSON + KRYO + [
     "@io_netty_netty//jar",
-    "//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",
     "//core/store/serializers:onos-core-serializers",
@@ -9,7 +9,7 @@
 
 TEST_DEPS = TEST_ADAPTERS + [
     "//protocols/pcep/server/api:onos-protocols-pcep-server-api-tests",
-    "//incubator/api:onos-incubator-api-tests",
+    "//apps/tunnel/api:onos-apps-tunnel-api-tests",
 ]
 
 osgi_jar_with_tests(
diff --git a/protocols/rest/api/BUILD b/protocols/rest/api/BUILD
index feaa98f..b60e376 100644
--- a/protocols/rest/api/BUILD
+++ b/protocols/rest/api/BUILD
@@ -9,7 +9,6 @@
     "@hk2_api//jar",
     "@aopalliance_repackaged//jar",
     "@javax_inject//jar",
-    "//incubator/api:onos-incubator-api",
     "//utils/rest:onlab-rest",
 ]
 
diff --git a/protocols/restconf/client/api/BUILD b/protocols/restconf/client/api/BUILD
index de08614..09ad99a 100644
--- a/protocols/restconf/client/api/BUILD
+++ b/protocols/restconf/client/api/BUILD
@@ -1,5 +1,4 @@
 COMPILE_DEPS = CORE_DEPS + [
-    "//incubator/api:onos-incubator-api",
     "//utils/rest:onlab-rest",
     "//protocols/rest/api:onos-protocols-rest-api",
 ]
diff --git a/protocols/snmp/api/BUILD b/protocols/snmp/api/BUILD
index dc9eb55..10a2c44 100644
--- a/protocols/snmp/api/BUILD
+++ b/protocols/snmp/api/BUILD
@@ -3,7 +3,6 @@
     "@snmp_core//jar",
     "@mibs_net_snmp//jar",
     "@mibs_rfc//jar",
-    "//incubator/api:onos-incubator-api",
 ]
 
 osgi_jar_with_tests(
diff --git a/protocols/snmp/api/src/main/java/org/onosproject/snmp/SnmpController.java b/protocols/snmp/api/src/main/java/org/onosproject/snmp/SnmpController.java
index f745565..872154a 100644
--- a/protocols/snmp/api/src/main/java/org/onosproject/snmp/SnmpController.java
+++ b/protocols/snmp/api/src/main/java/org/onosproject/snmp/SnmpController.java
@@ -19,7 +19,7 @@
 import com.btisystems.pronx.ems.core.snmp.ISnmpSession;
 import com.google.common.annotations.Beta;
 
-import org.onosproject.incubator.net.faultmanagement.alarm.DefaultAlarm;
+import org.onosproject.alarm.DefaultAlarm;
 import org.onosproject.net.DeviceId;
 
 import java.io.IOException;
diff --git a/protocols/snmp/ctl/BUILD b/protocols/snmp/ctl/BUILD
index 3ade757..2e5c6ef 100644
--- a/protocols/snmp/ctl/BUILD
+++ b/protocols/snmp/ctl/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",
 ]
 
diff --git a/protocols/snmp/ctl/src/main/java/org/onosproject/snmp/ctl/DefaultSnmpController.java b/protocols/snmp/ctl/src/main/java/org/onosproject/snmp/ctl/DefaultSnmpController.java
index a9eab3d..d5664e6 100644
--- a/protocols/snmp/ctl/src/main/java/org/onosproject/snmp/ctl/DefaultSnmpController.java
+++ b/protocols/snmp/ctl/src/main/java/org/onosproject/snmp/ctl/DefaultSnmpController.java
@@ -23,9 +23,9 @@
 import com.btisystems.pronx.ems.core.snmp.SnmpSessionFactory;
 import com.btisystems.pronx.ems.core.snmp.V2cSnmpConfiguration;
 import com.google.common.base.Preconditions;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmId;
-import org.onosproject.incubator.net.faultmanagement.alarm.DefaultAlarm;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmId;
+import org.onosproject.alarm.DefaultAlarm;
 import org.onosproject.net.DeviceId;
 import org.onosproject.snmp.SnmpController;
 import org.onosproject.snmp.SnmpDevice;
diff --git a/protocols/snmp/ctl/src/test/java/org/onosproject/snmp/ctl/DefaultSnmpControllerTest.java b/protocols/snmp/ctl/src/test/java/org/onosproject/snmp/ctl/DefaultSnmpControllerTest.java
index 27cd34f..41b4123 100644
--- a/protocols/snmp/ctl/src/test/java/org/onosproject/snmp/ctl/DefaultSnmpControllerTest.java
+++ b/protocols/snmp/ctl/src/test/java/org/onosproject/snmp/ctl/DefaultSnmpControllerTest.java
@@ -22,9 +22,9 @@
 import com.btisystems.pronx.ems.core.snmp.ISnmpSessionFactory;
 import org.junit.Before;
 import org.junit.Test;
-import org.onosproject.incubator.net.faultmanagement.alarm.Alarm;
-import org.onosproject.incubator.net.faultmanagement.alarm.AlarmId;
-import org.onosproject.incubator.net.faultmanagement.alarm.DefaultAlarm;
+import org.onosproject.alarm.Alarm;
+import org.onosproject.alarm.AlarmId;
+import org.onosproject.alarm.DefaultAlarm;
 
 import java.io.IOException;