diff --git a/include/Makefile.am b/include/Makefile.am
index 40a4daa90fc2..5328133dd4e4 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -67,48 +67,48 @@ odpdrvspecinclude_HEADERS = \
 		  odp/drv/spec/std_types.h \
 		  odp/drv/spec/sync.h
 
-odpapiabidefaultincludedir= $(includedir)/odp/arch/default/api/abi
+odpapiabidefaultincludedir= $(includedir)/odp/api/abi-default
 odpapiabidefaultinclude_HEADERS = \
-	odp/arch/default/api/abi/atomic.h \
-	odp/arch/default/api/abi/barrier.h \
-	odp/arch/default/api/abi/buffer.h \
-	odp/arch/default/api/abi/byteorder.h \
-	odp/arch/default/api/abi/classification.h \
-	odp/arch/default/api/abi/cpumask.h \
-	odp/arch/default/api/abi/crypto.h \
-	odp/arch/default/api/abi/event.h \
-	odp/arch/default/api/abi/init.h \
-	odp/arch/default/api/abi/ipsec.h \
-	odp/arch/default/api/abi/packet.h \
-	odp/arch/default/api/abi/packet_flags.h \
-	odp/arch/default/api/abi/packet_io.h \
-	odp/arch/default/api/abi/pool.h \
-	odp/arch/default/api/abi/queue.h \
-	odp/arch/default/api/abi/rwlock.h \
-	odp/arch/default/api/abi/rwlock_recursive.h \
-	odp/arch/default/api/abi/schedule.h \
-	odp/arch/default/api/abi/schedule_types.h \
-	odp/arch/default/api/abi/shared_memory.h \
-	odp/arch/default/api/abi/spinlock.h \
-	odp/arch/default/api/abi/spinlock_recursive.h \
-	odp/arch/default/api/abi/std_clib.h \
-	odp/arch/default/api/abi/std_types.h \
-	odp/arch/default/api/abi/sync.h \
-	odp/arch/default/api/abi/thread.h \
-	odp/arch/default/api/abi/thrmask.h \
-	odp/arch/default/api/abi/ticketlock.h \
-	odp/arch/default/api/abi/time.h \
-	odp/arch/default/api/abi/timer.h \
-	odp/arch/default/api/abi/traffic_mngr.h \
-	odp/arch/default/api/abi/version.h
-	odp/arch/default/api/abi/buffer.h \
-	odp/arch/default/api/abi/classification.h \
-	odp/arch/default/api/abi/crypto.h \
-	odp/arch/default/api/abi/event.h \
-	odp/arch/default/api/abi/packet.h \
-	odp/arch/default/api/abi/pool.h \
-	odp/arch/default/api/abi/queue.h \
-	odp/arch/default/api/abi/shared_memory.h
+	odp/api/abi-default/atomic.h \
+	odp/api/abi-default/barrier.h \
+	odp/api/abi-default/buffer.h \
+	odp/api/abi-default/byteorder.h \
+	odp/api/abi-default/classification.h \
+	odp/api/abi-default/cpumask.h \
+	odp/api/abi-default/crypto.h \
+	odp/api/abi-default/event.h \
+	odp/api/abi-default/init.h \
+	odp/api/abi-default/ipsec.h \
+	odp/api/abi-default/packet.h \
+	odp/api/abi-default/packet_flags.h \
+	odp/api/abi-default/packet_io.h \
+	odp/api/abi-default/pool.h \
+	odp/api/abi-default/queue.h \
+	odp/api/abi-default/rwlock.h \
+	odp/api/abi-default/rwlock_recursive.h \
+	odp/api/abi-default/schedule.h \
+	odp/api/abi-default/schedule_types.h \
+	odp/api/abi-default/shared_memory.h \
+	odp/api/abi-default/spinlock.h \
+	odp/api/abi-default/spinlock_recursive.h \
+	odp/api/abi-default/std_clib.h \
+	odp/api/abi-default/std_types.h \
+	odp/api/abi-default/sync.h \
+	odp/api/abi-default/thread.h \
+	odp/api/abi-default/thrmask.h \
+	odp/api/abi-default/ticketlock.h \
+	odp/api/abi-default/time.h \
+	odp/api/abi-default/timer.h \
+	odp/api/abi-default/traffic_mngr.h \
+	odp/api/abi-default/version.h
+	odp/api/abi-default/buffer.h \
+	odp/api/abi-default/classification.h \
+	odp/api/abi-default/crypto.h \
+	odp/api/abi-default/event.h \
+	odp/api/abi-default/packet.h \
+	odp/api/abi-default/pool.h \
+	odp/api/abi-default/queue.h \
+	odp/api/abi-default/shared_memory.h
 
 odpapiabiarchincludedir= $(includedir)/odp/arch/@ARCH_ABI@/odp/api/abi
 if ARCH_IS_ARM
diff --git a/include/odp/arch/default/api/abi/atomic.h b/include/odp/api/abi-default/atomic.h
similarity index 100%
rename from include/odp/arch/default/api/abi/atomic.h
rename to include/odp/api/abi-default/atomic.h
diff --git a/include/odp/arch/default/api/abi/barrier.h b/include/odp/api/abi-default/barrier.h
similarity index 100%
rename from include/odp/arch/default/api/abi/barrier.h
rename to include/odp/api/abi-default/barrier.h
diff --git a/include/odp/arch/default/api/abi/buffer.h b/include/odp/api/abi-default/buffer.h
similarity index 100%
rename from include/odp/arch/default/api/abi/buffer.h
rename to include/odp/api/abi-default/buffer.h
diff --git a/include/odp/arch/default/api/abi/byteorder.h b/include/odp/api/abi-default/byteorder.h
similarity index 100%
rename from include/odp/arch/default/api/abi/byteorder.h
rename to include/odp/api/abi-default/byteorder.h
diff --git a/include/odp/arch/default/api/abi/classification.h b/include/odp/api/abi-default/classification.h
similarity index 100%
rename from include/odp/arch/default/api/abi/classification.h
rename to include/odp/api/abi-default/classification.h
diff --git a/include/odp/arch/default/api/abi/cpumask.h b/include/odp/api/abi-default/cpumask.h
similarity index 100%
rename from include/odp/arch/default/api/abi/cpumask.h
rename to include/odp/api/abi-default/cpumask.h
diff --git a/include/odp/arch/default/api/abi/crypto.h b/include/odp/api/abi-default/crypto.h
similarity index 100%
rename from include/odp/arch/default/api/abi/crypto.h
rename to include/odp/api/abi-default/crypto.h
diff --git a/include/odp/arch/default/api/abi/event.h b/include/odp/api/abi-default/event.h
similarity index 100%
rename from include/odp/arch/default/api/abi/event.h
rename to include/odp/api/abi-default/event.h
diff --git a/include/odp/arch/default/api/abi/init.h b/include/odp/api/abi-default/init.h
similarity index 100%
rename from include/odp/arch/default/api/abi/init.h
rename to include/odp/api/abi-default/init.h
diff --git a/include/odp/arch/default/api/abi/ipsec.h b/include/odp/api/abi-default/ipsec.h
similarity index 100%
rename from include/odp/arch/default/api/abi/ipsec.h
rename to include/odp/api/abi-default/ipsec.h
diff --git a/include/odp/arch/default/api/abi/packet.h b/include/odp/api/abi-default/packet.h
similarity index 100%
rename from include/odp/arch/default/api/abi/packet.h
rename to include/odp/api/abi-default/packet.h
diff --git a/include/odp/arch/default/api/abi/packet_flags.h b/include/odp/api/abi-default/packet_flags.h
similarity index 100%
rename from include/odp/arch/default/api/abi/packet_flags.h
rename to include/odp/api/abi-default/packet_flags.h
diff --git a/include/odp/arch/default/api/abi/packet_io.h b/include/odp/api/abi-default/packet_io.h
similarity index 100%
rename from include/odp/arch/default/api/abi/packet_io.h
rename to include/odp/api/abi-default/packet_io.h
diff --git a/include/odp/arch/default/api/abi/pool.h b/include/odp/api/abi-default/pool.h
similarity index 100%
rename from include/odp/arch/default/api/abi/pool.h
rename to include/odp/api/abi-default/pool.h
diff --git a/include/odp/arch/default/api/abi/queue.h b/include/odp/api/abi-default/queue.h
similarity index 100%
rename from include/odp/arch/default/api/abi/queue.h
rename to include/odp/api/abi-default/queue.h
diff --git a/include/odp/arch/default/api/abi/rwlock.h b/include/odp/api/abi-default/rwlock.h
similarity index 100%
rename from include/odp/arch/default/api/abi/rwlock.h
rename to include/odp/api/abi-default/rwlock.h
diff --git a/include/odp/arch/default/api/abi/rwlock_recursive.h b/include/odp/api/abi-default/rwlock_recursive.h
similarity index 100%
rename from include/odp/arch/default/api/abi/rwlock_recursive.h
rename to include/odp/api/abi-default/rwlock_recursive.h
diff --git a/include/odp/arch/default/api/abi/schedule.h b/include/odp/api/abi-default/schedule.h
similarity index 100%
rename from include/odp/arch/default/api/abi/schedule.h
rename to include/odp/api/abi-default/schedule.h
diff --git a/include/odp/arch/default/api/abi/schedule_types.h b/include/odp/api/abi-default/schedule_types.h
similarity index 100%
rename from include/odp/arch/default/api/abi/schedule_types.h
rename to include/odp/api/abi-default/schedule_types.h
diff --git a/include/odp/arch/default/api/abi/shared_memory.h b/include/odp/api/abi-default/shared_memory.h
similarity index 100%
rename from include/odp/arch/default/api/abi/shared_memory.h
rename to include/odp/api/abi-default/shared_memory.h
diff --git a/include/odp/arch/default/api/abi/spinlock.h b/include/odp/api/abi-default/spinlock.h
similarity index 100%
rename from include/odp/arch/default/api/abi/spinlock.h
rename to include/odp/api/abi-default/spinlock.h
diff --git a/include/odp/arch/default/api/abi/spinlock_recursive.h b/include/odp/api/abi-default/spinlock_recursive.h
similarity index 100%
rename from include/odp/arch/default/api/abi/spinlock_recursive.h
rename to include/odp/api/abi-default/spinlock_recursive.h
diff --git a/include/odp/arch/default/api/abi/std_clib.h b/include/odp/api/abi-default/std_clib.h
similarity index 100%
rename from include/odp/arch/default/api/abi/std_clib.h
rename to include/odp/api/abi-default/std_clib.h
diff --git a/include/odp/arch/default/api/abi/std_types.h b/include/odp/api/abi-default/std_types.h
similarity index 100%
rename from include/odp/arch/default/api/abi/std_types.h
rename to include/odp/api/abi-default/std_types.h
diff --git a/include/odp/arch/default/api/abi/sync.h b/include/odp/api/abi-default/sync.h
similarity index 100%
rename from include/odp/arch/default/api/abi/sync.h
rename to include/odp/api/abi-default/sync.h
diff --git a/include/odp/arch/default/api/abi/thread.h b/include/odp/api/abi-default/thread.h
similarity index 100%
rename from include/odp/arch/default/api/abi/thread.h
rename to include/odp/api/abi-default/thread.h
diff --git a/include/odp/arch/default/api/abi/thrmask.h b/include/odp/api/abi-default/thrmask.h
similarity index 100%
rename from include/odp/arch/default/api/abi/thrmask.h
rename to include/odp/api/abi-default/thrmask.h
diff --git a/include/odp/arch/default/api/abi/ticketlock.h b/include/odp/api/abi-default/ticketlock.h
similarity index 100%
rename from include/odp/arch/default/api/abi/ticketlock.h
rename to include/odp/api/abi-default/ticketlock.h
diff --git a/include/odp/arch/default/api/abi/time.h b/include/odp/api/abi-default/time.h
similarity index 100%
rename from include/odp/arch/default/api/abi/time.h
rename to include/odp/api/abi-default/time.h
diff --git a/include/odp/arch/default/api/abi/timer.h b/include/odp/api/abi-default/timer.h
similarity index 100%
rename from include/odp/arch/default/api/abi/timer.h
rename to include/odp/api/abi-default/timer.h
diff --git a/include/odp/arch/default/api/abi/traffic_mngr.h b/include/odp/api/abi-default/traffic_mngr.h
similarity index 100%
rename from include/odp/arch/default/api/abi/traffic_mngr.h
rename to include/odp/api/abi-default/traffic_mngr.h
diff --git a/include/odp/arch/default/api/abi/version.h b/include/odp/api/abi-default/version.h
similarity index 100%
rename from include/odp/arch/default/api/abi/version.h
rename to include/odp/api/abi-default/version.h
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/atomic.h b/include/odp/arch/arm32-linux/odp/api/abi/atomic.h
index 523c614ae2cc..8848ad19f9ba 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/atomic.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/atomic.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/atomic.h>
+#include <odp/api/abi-default/atomic.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/barrier.h b/include/odp/arch/arm32-linux/odp/api/abi/barrier.h
index 11c3450103ba..9d6c256eb68e 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/barrier.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/barrier.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/barrier.h>
+#include <odp/api/abi-default/barrier.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/buffer.h b/include/odp/arch/arm32-linux/odp/api/abi/buffer.h
index d9c31930dd3f..68a678964f4b 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/buffer.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/buffer.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/buffer.h>
+#include <odp/api/abi-default/buffer.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/byteorder.h b/include/odp/arch/arm32-linux/odp/api/abi/byteorder.h
index c76073317844..2fd53414ce01 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/byteorder.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/byteorder.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/byteorder.h>
+#include <odp/api/abi-default/byteorder.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/classification.h b/include/odp/arch/arm32-linux/odp/api/abi/classification.h
index d48a4733f0c7..5a0cac98f790 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/classification.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/classification.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/classification.h>
+#include <odp/api/abi-default/classification.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/cpumask.h b/include/odp/arch/arm32-linux/odp/api/abi/cpumask.h
index 56266f8b3a31..d991896d8eea 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/cpumask.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/cpumask.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/cpumask.h>
+#include <odp/api/abi-default/cpumask.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/crypto.h b/include/odp/arch/arm32-linux/odp/api/abi/crypto.h
index 9a9d2dc1bf8a..d33a777bd345 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/crypto.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/crypto.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/crypto.h>
+#include <odp/api/abi-default/crypto.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/event.h b/include/odp/arch/arm32-linux/odp/api/abi/event.h
index 5d2ac75e7cb0..cbbf47f1286c 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/event.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/event.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/event.h>
+#include <odp/api/abi-default/event.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/init.h b/include/odp/arch/arm32-linux/odp/api/abi/init.h
index 86b4852d9902..81eafefe3070 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/init.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/init.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/init.h>
+#include <odp/api/abi-default/init.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/ipsec.h b/include/odp/arch/arm32-linux/odp/api/abi/ipsec.h
index e392c8ac0bc2..b6747d29ed3e 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/ipsec.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/ipsec.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/ipsec.h>
+#include <odp/api/abi-default/ipsec.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/packet.h b/include/odp/arch/arm32-linux/odp/api/abi/packet.h
index f44cb53653b3..ca28eed2adcc 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/packet.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/packet.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/packet.h>
+#include <odp/api/abi-default/packet.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/packet_flags.h b/include/odp/arch/arm32-linux/odp/api/abi/packet_flags.h
index 08f954aae1ed..a60c8bd07307 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/packet_flags.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/packet_flags.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/packet_flags.h>
+#include <odp/api/abi-default/packet_flags.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/packet_io.h b/include/odp/arch/arm32-linux/odp/api/abi/packet_io.h
index e80c1452b568..79b49262a98a 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/packet_io.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/packet_io.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/packet_io.h>
+#include <odp/api/abi-default/packet_io.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/pool.h b/include/odp/arch/arm32-linux/odp/api/abi/pool.h
index b354afbf7282..b59365eb5531 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/pool.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/pool.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/pool.h>
+#include <odp/api/abi-default/pool.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/queue.h b/include/odp/arch/arm32-linux/odp/api/abi/queue.h
index 6027cee2f8ff..66e2a3415e0b 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/queue.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/queue.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/queue.h>
+#include <odp/api/abi-default/queue.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/rwlock.h b/include/odp/arch/arm32-linux/odp/api/abi/rwlock.h
index 61faaf76b445..cba0743e74be 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/rwlock.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/rwlock.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/rwlock.h>
+#include <odp/api/abi-default/rwlock.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h
index ccfdf14aad8b..841710d3c821 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/rwlock_recursive.h>
+#include <odp/api/abi-default/rwlock_recursive.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/schedule.h b/include/odp/arch/arm32-linux/odp/api/abi/schedule.h
index 82148ca978d5..18427744fc84 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/schedule.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/schedule.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/schedule.h>
+#include <odp/api/abi-default/schedule.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/schedule_types.h b/include/odp/arch/arm32-linux/odp/api/abi/schedule_types.h
index 1b4f2b316320..b3ea96b5a1d1 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/schedule_types.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/schedule_types.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/schedule_types.h>
+#include <odp/api/abi-default/schedule_types.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/shared_memory.h b/include/odp/arch/arm32-linux/odp/api/abi/shared_memory.h
index d203678597e8..e80c4f320f83 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/shared_memory.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/shared_memory.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/shared_memory.h>
+#include <odp/api/abi-default/shared_memory.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/spinlock.h b/include/odp/arch/arm32-linux/odp/api/abi/spinlock.h
index 2e863b014f90..4894095bb08a 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/spinlock.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/spinlock.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/spinlock.h>
+#include <odp/api/abi-default/spinlock.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h
index e90219d901c4..a7a49bd4d1c9 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/spinlock_recursive.h>
+#include <odp/api/abi-default/spinlock_recursive.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/std_clib.h b/include/odp/arch/arm32-linux/odp/api/abi/std_clib.h
index bda9fd3078fb..72898878a9fe 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/std_clib.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/std_clib.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/std_clib.h>
+#include <odp/api/abi-default/std_clib.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/std_types.h b/include/odp/arch/arm32-linux/odp/api/abi/std_types.h
index 44fc6f5ae20e..91130000a7f3 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/std_types.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/std_types.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/std_types.h>
+#include <odp/api/abi-default/std_types.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/sync.h b/include/odp/arch/arm32-linux/odp/api/abi/sync.h
index 2fd45b629040..8e5f813211c0 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/sync.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/sync.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/sync.h>
+#include <odp/api/abi-default/sync.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/thread.h b/include/odp/arch/arm32-linux/odp/api/abi/thread.h
index 69023d36bb4a..dc29a7dac301 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/thread.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/thread.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/thread.h>
+#include <odp/api/abi-default/thread.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/thrmask.h b/include/odp/arch/arm32-linux/odp/api/abi/thrmask.h
index 523999dcc087..0c1dc0ce59ad 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/thrmask.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/thrmask.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/thrmask.h>
+#include <odp/api/abi-default/thrmask.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/ticketlock.h b/include/odp/arch/arm32-linux/odp/api/abi/ticketlock.h
index 160b5e156c9b..0065ce02821c 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/ticketlock.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/ticketlock.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/ticketlock.h>
+#include <odp/api/abi-default/ticketlock.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/time.h b/include/odp/arch/arm32-linux/odp/api/abi/time.h
index d4d734033c61..2672d7892624 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/time.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/time.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/time.h>
+#include <odp/api/abi-default/time.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/timer.h b/include/odp/arch/arm32-linux/odp/api/abi/timer.h
index fea797339150..e52a3e12968b 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/timer.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/timer.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/timer.h>
+#include <odp/api/abi-default/timer.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h
index 41d297bce42f..4245cbf7068b 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/traffic_mngr.h>
+#include <odp/api/abi-default/traffic_mngr.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/version.h b/include/odp/arch/arm32-linux/odp/api/abi/version.h
index 1cdd175edb9a..b36d53958931 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/version.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/version.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/version.h>
+#include <odp/api/abi-default/version.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/atomic.h b/include/odp/arch/arm64-linux/odp/api/abi/atomic.h
index 523c614ae2cc..8848ad19f9ba 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/atomic.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/atomic.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/atomic.h>
+#include <odp/api/abi-default/atomic.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/barrier.h b/include/odp/arch/arm64-linux/odp/api/abi/barrier.h
index 11c3450103ba..9d6c256eb68e 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/barrier.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/barrier.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/barrier.h>
+#include <odp/api/abi-default/barrier.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/buffer.h b/include/odp/arch/arm64-linux/odp/api/abi/buffer.h
index d9c31930dd3f..68a678964f4b 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/buffer.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/buffer.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/buffer.h>
+#include <odp/api/abi-default/buffer.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/byteorder.h b/include/odp/arch/arm64-linux/odp/api/abi/byteorder.h
index c76073317844..2fd53414ce01 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/byteorder.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/byteorder.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/byteorder.h>
+#include <odp/api/abi-default/byteorder.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/classification.h b/include/odp/arch/arm64-linux/odp/api/abi/classification.h
index d48a4733f0c7..5a0cac98f790 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/classification.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/classification.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/classification.h>
+#include <odp/api/abi-default/classification.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/cpumask.h b/include/odp/arch/arm64-linux/odp/api/abi/cpumask.h
index 56266f8b3a31..d991896d8eea 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/cpumask.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/cpumask.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/cpumask.h>
+#include <odp/api/abi-default/cpumask.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/crypto.h b/include/odp/arch/arm64-linux/odp/api/abi/crypto.h
index 9a9d2dc1bf8a..d33a777bd345 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/crypto.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/crypto.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/crypto.h>
+#include <odp/api/abi-default/crypto.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/event.h b/include/odp/arch/arm64-linux/odp/api/abi/event.h
index 5d2ac75e7cb0..cbbf47f1286c 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/event.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/event.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/event.h>
+#include <odp/api/abi-default/event.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/init.h b/include/odp/arch/arm64-linux/odp/api/abi/init.h
index 86b4852d9902..81eafefe3070 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/init.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/init.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/init.h>
+#include <odp/api/abi-default/init.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/ipsec.h b/include/odp/arch/arm64-linux/odp/api/abi/ipsec.h
index e392c8ac0bc2..b6747d29ed3e 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/ipsec.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/ipsec.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/ipsec.h>
+#include <odp/api/abi-default/ipsec.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/packet.h b/include/odp/arch/arm64-linux/odp/api/abi/packet.h
index f44cb53653b3..ca28eed2adcc 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/packet.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/packet.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/packet.h>
+#include <odp/api/abi-default/packet.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/packet_flags.h b/include/odp/arch/arm64-linux/odp/api/abi/packet_flags.h
index 08f954aae1ed..a60c8bd07307 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/packet_flags.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/packet_flags.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/packet_flags.h>
+#include <odp/api/abi-default/packet_flags.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/packet_io.h b/include/odp/arch/arm64-linux/odp/api/abi/packet_io.h
index e80c1452b568..79b49262a98a 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/packet_io.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/packet_io.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/packet_io.h>
+#include <odp/api/abi-default/packet_io.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/pool.h b/include/odp/arch/arm64-linux/odp/api/abi/pool.h
index b354afbf7282..b59365eb5531 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/pool.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/pool.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/pool.h>
+#include <odp/api/abi-default/pool.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/queue.h b/include/odp/arch/arm64-linux/odp/api/abi/queue.h
index 6027cee2f8ff..66e2a3415e0b 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/queue.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/queue.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/queue.h>
+#include <odp/api/abi-default/queue.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/rwlock.h b/include/odp/arch/arm64-linux/odp/api/abi/rwlock.h
index 61faaf76b445..cba0743e74be 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/rwlock.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/rwlock.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/rwlock.h>
+#include <odp/api/abi-default/rwlock.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h
index ccfdf14aad8b..841710d3c821 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/rwlock_recursive.h>
+#include <odp/api/abi-default/rwlock_recursive.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/schedule.h b/include/odp/arch/arm64-linux/odp/api/abi/schedule.h
index 82148ca978d5..18427744fc84 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/schedule.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/schedule.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/schedule.h>
+#include <odp/api/abi-default/schedule.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/schedule_types.h b/include/odp/arch/arm64-linux/odp/api/abi/schedule_types.h
index 1b4f2b316320..b3ea96b5a1d1 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/schedule_types.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/schedule_types.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/schedule_types.h>
+#include <odp/api/abi-default/schedule_types.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/shared_memory.h b/include/odp/arch/arm64-linux/odp/api/abi/shared_memory.h
index d203678597e8..e80c4f320f83 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/shared_memory.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/shared_memory.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/shared_memory.h>
+#include <odp/api/abi-default/shared_memory.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/spinlock.h b/include/odp/arch/arm64-linux/odp/api/abi/spinlock.h
index 2e863b014f90..4894095bb08a 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/spinlock.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/spinlock.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/spinlock.h>
+#include <odp/api/abi-default/spinlock.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h
index e90219d901c4..a7a49bd4d1c9 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/spinlock_recursive.h>
+#include <odp/api/abi-default/spinlock_recursive.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/std_clib.h b/include/odp/arch/arm64-linux/odp/api/abi/std_clib.h
index bda9fd3078fb..72898878a9fe 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/std_clib.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/std_clib.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/std_clib.h>
+#include <odp/api/abi-default/std_clib.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/std_types.h b/include/odp/arch/arm64-linux/odp/api/abi/std_types.h
index 44fc6f5ae20e..91130000a7f3 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/std_types.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/std_types.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/std_types.h>
+#include <odp/api/abi-default/std_types.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/sync.h b/include/odp/arch/arm64-linux/odp/api/abi/sync.h
index 2fd45b629040..8e5f813211c0 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/sync.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/sync.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/sync.h>
+#include <odp/api/abi-default/sync.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/thread.h b/include/odp/arch/arm64-linux/odp/api/abi/thread.h
index 69023d36bb4a..dc29a7dac301 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/thread.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/thread.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/thread.h>
+#include <odp/api/abi-default/thread.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/thrmask.h b/include/odp/arch/arm64-linux/odp/api/abi/thrmask.h
index 523999dcc087..0c1dc0ce59ad 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/thrmask.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/thrmask.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/thrmask.h>
+#include <odp/api/abi-default/thrmask.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/ticketlock.h b/include/odp/arch/arm64-linux/odp/api/abi/ticketlock.h
index 160b5e156c9b..0065ce02821c 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/ticketlock.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/ticketlock.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/ticketlock.h>
+#include <odp/api/abi-default/ticketlock.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/time.h b/include/odp/arch/arm64-linux/odp/api/abi/time.h
index d4d734033c61..2672d7892624 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/time.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/time.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/time.h>
+#include <odp/api/abi-default/time.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/timer.h b/include/odp/arch/arm64-linux/odp/api/abi/timer.h
index fea797339150..e52a3e12968b 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/timer.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/timer.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/timer.h>
+#include <odp/api/abi-default/timer.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h
index 41d297bce42f..4245cbf7068b 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/traffic_mngr.h>
+#include <odp/api/abi-default/traffic_mngr.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/version.h b/include/odp/arch/arm64-linux/odp/api/abi/version.h
index 1cdd175edb9a..b36d53958931 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/version.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/version.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/version.h>
+#include <odp/api/abi-default/version.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/atomic.h b/include/odp/arch/mips64-linux/odp/api/abi/atomic.h
index 523c614ae2cc..8848ad19f9ba 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/atomic.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/atomic.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/atomic.h>
+#include <odp/api/abi-default/atomic.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/barrier.h b/include/odp/arch/mips64-linux/odp/api/abi/barrier.h
index 11c3450103ba..9d6c256eb68e 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/barrier.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/barrier.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/barrier.h>
+#include <odp/api/abi-default/barrier.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/buffer.h b/include/odp/arch/mips64-linux/odp/api/abi/buffer.h
index d9c31930dd3f..68a678964f4b 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/buffer.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/buffer.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/buffer.h>
+#include <odp/api/abi-default/buffer.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/byteorder.h b/include/odp/arch/mips64-linux/odp/api/abi/byteorder.h
index c76073317844..2fd53414ce01 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/byteorder.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/byteorder.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/byteorder.h>
+#include <odp/api/abi-default/byteorder.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/classification.h b/include/odp/arch/mips64-linux/odp/api/abi/classification.h
index d48a4733f0c7..5a0cac98f790 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/classification.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/classification.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/classification.h>
+#include <odp/api/abi-default/classification.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/cpumask.h b/include/odp/arch/mips64-linux/odp/api/abi/cpumask.h
index 56266f8b3a31..d991896d8eea 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/cpumask.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/cpumask.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/cpumask.h>
+#include <odp/api/abi-default/cpumask.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/crypto.h b/include/odp/arch/mips64-linux/odp/api/abi/crypto.h
index 9a9d2dc1bf8a..d33a777bd345 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/crypto.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/crypto.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/crypto.h>
+#include <odp/api/abi-default/crypto.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/event.h b/include/odp/arch/mips64-linux/odp/api/abi/event.h
index 5d2ac75e7cb0..cbbf47f1286c 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/event.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/event.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/event.h>
+#include <odp/api/abi-default/event.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/init.h b/include/odp/arch/mips64-linux/odp/api/abi/init.h
index 86b4852d9902..81eafefe3070 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/init.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/init.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/init.h>
+#include <odp/api/abi-default/init.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/ipsec.h b/include/odp/arch/mips64-linux/odp/api/abi/ipsec.h
index e392c8ac0bc2..b6747d29ed3e 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/ipsec.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/ipsec.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/ipsec.h>
+#include <odp/api/abi-default/ipsec.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/packet.h b/include/odp/arch/mips64-linux/odp/api/abi/packet.h
index f44cb53653b3..ca28eed2adcc 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/packet.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/packet.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/packet.h>
+#include <odp/api/abi-default/packet.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/packet_flags.h b/include/odp/arch/mips64-linux/odp/api/abi/packet_flags.h
index 08f954aae1ed..a60c8bd07307 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/packet_flags.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/packet_flags.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/packet_flags.h>
+#include <odp/api/abi-default/packet_flags.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/packet_io.h b/include/odp/arch/mips64-linux/odp/api/abi/packet_io.h
index e80c1452b568..79b49262a98a 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/packet_io.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/packet_io.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/packet_io.h>
+#include <odp/api/abi-default/packet_io.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/pool.h b/include/odp/arch/mips64-linux/odp/api/abi/pool.h
index b354afbf7282..b59365eb5531 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/pool.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/pool.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/pool.h>
+#include <odp/api/abi-default/pool.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/queue.h b/include/odp/arch/mips64-linux/odp/api/abi/queue.h
index 6027cee2f8ff..66e2a3415e0b 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/queue.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/queue.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/queue.h>
+#include <odp/api/abi-default/queue.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/rwlock.h b/include/odp/arch/mips64-linux/odp/api/abi/rwlock.h
index 61faaf76b445..cba0743e74be 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/rwlock.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/rwlock.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/rwlock.h>
+#include <odp/api/abi-default/rwlock.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h
index ccfdf14aad8b..841710d3c821 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/rwlock_recursive.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/rwlock_recursive.h>
+#include <odp/api/abi-default/rwlock_recursive.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/schedule.h b/include/odp/arch/mips64-linux/odp/api/abi/schedule.h
index 82148ca978d5..18427744fc84 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/schedule.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/schedule.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/schedule.h>
+#include <odp/api/abi-default/schedule.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/schedule_types.h b/include/odp/arch/mips64-linux/odp/api/abi/schedule_types.h
index 1b4f2b316320..b3ea96b5a1d1 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/schedule_types.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/schedule_types.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/schedule_types.h>
+#include <odp/api/abi-default/schedule_types.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/shared_memory.h b/include/odp/arch/mips64-linux/odp/api/abi/shared_memory.h
index d203678597e8..e80c4f320f83 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/shared_memory.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/shared_memory.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/shared_memory.h>
+#include <odp/api/abi-default/shared_memory.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/spinlock.h b/include/odp/arch/mips64-linux/odp/api/abi/spinlock.h
index 2e863b014f90..4894095bb08a 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/spinlock.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/spinlock.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/spinlock.h>
+#include <odp/api/abi-default/spinlock.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h
index e90219d901c4..a7a49bd4d1c9 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/spinlock_recursive.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/spinlock_recursive.h>
+#include <odp/api/abi-default/spinlock_recursive.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/std_clib.h b/include/odp/arch/mips64-linux/odp/api/abi/std_clib.h
index bda9fd3078fb..72898878a9fe 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/std_clib.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/std_clib.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/std_clib.h>
+#include <odp/api/abi-default/std_clib.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/std_types.h b/include/odp/arch/mips64-linux/odp/api/abi/std_types.h
index 44fc6f5ae20e..91130000a7f3 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/std_types.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/std_types.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/std_types.h>
+#include <odp/api/abi-default/std_types.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/sync.h b/include/odp/arch/mips64-linux/odp/api/abi/sync.h
index 2fd45b629040..8e5f813211c0 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/sync.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/sync.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/sync.h>
+#include <odp/api/abi-default/sync.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/thread.h b/include/odp/arch/mips64-linux/odp/api/abi/thread.h
index 69023d36bb4a..dc29a7dac301 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/thread.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/thread.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/thread.h>
+#include <odp/api/abi-default/thread.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/thrmask.h b/include/odp/arch/mips64-linux/odp/api/abi/thrmask.h
index 523999dcc087..0c1dc0ce59ad 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/thrmask.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/thrmask.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/thrmask.h>
+#include <odp/api/abi-default/thrmask.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/ticketlock.h b/include/odp/arch/mips64-linux/odp/api/abi/ticketlock.h
index 160b5e156c9b..0065ce02821c 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/ticketlock.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/ticketlock.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/ticketlock.h>
+#include <odp/api/abi-default/ticketlock.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/time.h b/include/odp/arch/mips64-linux/odp/api/abi/time.h
index d4d734033c61..2672d7892624 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/time.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/time.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/time.h>
+#include <odp/api/abi-default/time.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/timer.h b/include/odp/arch/mips64-linux/odp/api/abi/timer.h
index fea797339150..e52a3e12968b 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/timer.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/timer.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/timer.h>
+#include <odp/api/abi-default/timer.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/mips64-linux/odp/api/abi/traffic_mngr.h
index 41d297bce42f..4245cbf7068b 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/traffic_mngr.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/traffic_mngr.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/traffic_mngr.h>
+#include <odp/api/abi-default/traffic_mngr.h>
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/version.h b/include/odp/arch/mips64-linux/odp/api/abi/version.h
index 1cdd175edb9a..b36d53958931 100644
--- a/include/odp/arch/mips64-linux/odp/api/abi/version.h
+++ b/include/odp/arch/mips64-linux/odp/api/abi/version.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/version.h>
+#include <odp/api/abi-default/version.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/atomic.h b/include/odp/arch/power64-linux/odp/api/abi/atomic.h
index 523c614ae2cc..8848ad19f9ba 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/atomic.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/atomic.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/atomic.h>
+#include <odp/api/abi-default/atomic.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/barrier.h b/include/odp/arch/power64-linux/odp/api/abi/barrier.h
index 11c3450103ba..9d6c256eb68e 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/barrier.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/barrier.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/barrier.h>
+#include <odp/api/abi-default/barrier.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/buffer.h b/include/odp/arch/power64-linux/odp/api/abi/buffer.h
index d9c31930dd3f..68a678964f4b 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/buffer.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/buffer.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/buffer.h>
+#include <odp/api/abi-default/buffer.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/byteorder.h b/include/odp/arch/power64-linux/odp/api/abi/byteorder.h
index c76073317844..2fd53414ce01 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/byteorder.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/byteorder.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/byteorder.h>
+#include <odp/api/abi-default/byteorder.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/classification.h b/include/odp/arch/power64-linux/odp/api/abi/classification.h
index d48a4733f0c7..5a0cac98f790 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/classification.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/classification.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/classification.h>
+#include <odp/api/abi-default/classification.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/cpumask.h b/include/odp/arch/power64-linux/odp/api/abi/cpumask.h
index 56266f8b3a31..d991896d8eea 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/cpumask.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/cpumask.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/cpumask.h>
+#include <odp/api/abi-default/cpumask.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/crypto.h b/include/odp/arch/power64-linux/odp/api/abi/crypto.h
index 9a9d2dc1bf8a..d33a777bd345 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/crypto.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/crypto.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/crypto.h>
+#include <odp/api/abi-default/crypto.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/event.h b/include/odp/arch/power64-linux/odp/api/abi/event.h
index 5d2ac75e7cb0..cbbf47f1286c 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/event.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/event.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/event.h>
+#include <odp/api/abi-default/event.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/init.h b/include/odp/arch/power64-linux/odp/api/abi/init.h
index 86b4852d9902..81eafefe3070 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/init.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/init.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/init.h>
+#include <odp/api/abi-default/init.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/ipsec.h b/include/odp/arch/power64-linux/odp/api/abi/ipsec.h
index e392c8ac0bc2..b6747d29ed3e 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/ipsec.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/ipsec.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/ipsec.h>
+#include <odp/api/abi-default/ipsec.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/packet.h b/include/odp/arch/power64-linux/odp/api/abi/packet.h
index f44cb53653b3..ca28eed2adcc 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/packet.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/packet.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/packet.h>
+#include <odp/api/abi-default/packet.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/packet_flags.h b/include/odp/arch/power64-linux/odp/api/abi/packet_flags.h
index 08f954aae1ed..a60c8bd07307 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/packet_flags.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/packet_flags.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/packet_flags.h>
+#include <odp/api/abi-default/packet_flags.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/packet_io.h b/include/odp/arch/power64-linux/odp/api/abi/packet_io.h
index e80c1452b568..79b49262a98a 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/packet_io.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/packet_io.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/packet_io.h>
+#include <odp/api/abi-default/packet_io.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/pool.h b/include/odp/arch/power64-linux/odp/api/abi/pool.h
index b354afbf7282..b59365eb5531 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/pool.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/pool.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/pool.h>
+#include <odp/api/abi-default/pool.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/queue.h b/include/odp/arch/power64-linux/odp/api/abi/queue.h
index 6027cee2f8ff..66e2a3415e0b 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/queue.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/queue.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/queue.h>
+#include <odp/api/abi-default/queue.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/rwlock.h b/include/odp/arch/power64-linux/odp/api/abi/rwlock.h
index 61faaf76b445..cba0743e74be 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/rwlock.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/rwlock.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/rwlock.h>
+#include <odp/api/abi-default/rwlock.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h
index ccfdf14aad8b..841710d3c821 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/rwlock_recursive.h>
+#include <odp/api/abi-default/rwlock_recursive.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/schedule.h b/include/odp/arch/power64-linux/odp/api/abi/schedule.h
index 82148ca978d5..18427744fc84 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/schedule.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/schedule.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/schedule.h>
+#include <odp/api/abi-default/schedule.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/schedule_types.h b/include/odp/arch/power64-linux/odp/api/abi/schedule_types.h
index 1b4f2b316320..b3ea96b5a1d1 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/schedule_types.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/schedule_types.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/schedule_types.h>
+#include <odp/api/abi-default/schedule_types.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/shared_memory.h b/include/odp/arch/power64-linux/odp/api/abi/shared_memory.h
index d203678597e8..e80c4f320f83 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/shared_memory.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/shared_memory.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/shared_memory.h>
+#include <odp/api/abi-default/shared_memory.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/spinlock.h b/include/odp/arch/power64-linux/odp/api/abi/spinlock.h
index 2e863b014f90..4894095bb08a 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/spinlock.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/spinlock.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/spinlock.h>
+#include <odp/api/abi-default/spinlock.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h
index e90219d901c4..a7a49bd4d1c9 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/spinlock_recursive.h>
+#include <odp/api/abi-default/spinlock_recursive.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/std_clib.h b/include/odp/arch/power64-linux/odp/api/abi/std_clib.h
index bda9fd3078fb..72898878a9fe 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/std_clib.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/std_clib.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/std_clib.h>
+#include <odp/api/abi-default/std_clib.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/std_types.h b/include/odp/arch/power64-linux/odp/api/abi/std_types.h
index 44fc6f5ae20e..91130000a7f3 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/std_types.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/std_types.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/std_types.h>
+#include <odp/api/abi-default/std_types.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/sync.h b/include/odp/arch/power64-linux/odp/api/abi/sync.h
index 2fd45b629040..8e5f813211c0 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/sync.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/sync.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/sync.h>
+#include <odp/api/abi-default/sync.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/thread.h b/include/odp/arch/power64-linux/odp/api/abi/thread.h
index 69023d36bb4a..dc29a7dac301 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/thread.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/thread.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/thread.h>
+#include <odp/api/abi-default/thread.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/thrmask.h b/include/odp/arch/power64-linux/odp/api/abi/thrmask.h
index 523999dcc087..0c1dc0ce59ad 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/thrmask.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/thrmask.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/thrmask.h>
+#include <odp/api/abi-default/thrmask.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/ticketlock.h b/include/odp/arch/power64-linux/odp/api/abi/ticketlock.h
index 160b5e156c9b..0065ce02821c 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/ticketlock.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/ticketlock.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/ticketlock.h>
+#include <odp/api/abi-default/ticketlock.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/time.h b/include/odp/arch/power64-linux/odp/api/abi/time.h
index d4d734033c61..2672d7892624 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/time.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/time.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/time.h>
+#include <odp/api/abi-default/time.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/timer.h b/include/odp/arch/power64-linux/odp/api/abi/timer.h
index fea797339150..e52a3e12968b 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/timer.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/timer.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/timer.h>
+#include <odp/api/abi-default/timer.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/power64-linux/odp/api/abi/traffic_mngr.h
index 41d297bce42f..4245cbf7068b 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/traffic_mngr.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/traffic_mngr.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/traffic_mngr.h>
+#include <odp/api/abi-default/traffic_mngr.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/version.h b/include/odp/arch/power64-linux/odp/api/abi/version.h
index 1cdd175edb9a..b36d53958931 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/version.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/version.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/version.h>
+#include <odp/api/abi-default/version.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/atomic.h b/include/odp/arch/x86_32-linux/odp/api/abi/atomic.h
index 523c614ae2cc..8848ad19f9ba 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/atomic.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/atomic.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/atomic.h>
+#include <odp/api/abi-default/atomic.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/barrier.h b/include/odp/arch/x86_32-linux/odp/api/abi/barrier.h
index 11c3450103ba..9d6c256eb68e 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/barrier.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/barrier.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/barrier.h>
+#include <odp/api/abi-default/barrier.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/buffer.h b/include/odp/arch/x86_32-linux/odp/api/abi/buffer.h
index d9c31930dd3f..68a678964f4b 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/buffer.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/buffer.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/buffer.h>
+#include <odp/api/abi-default/buffer.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/byteorder.h b/include/odp/arch/x86_32-linux/odp/api/abi/byteorder.h
index c76073317844..2fd53414ce01 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/byteorder.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/byteorder.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/byteorder.h>
+#include <odp/api/abi-default/byteorder.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/classification.h b/include/odp/arch/x86_32-linux/odp/api/abi/classification.h
index d48a4733f0c7..5a0cac98f790 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/classification.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/classification.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/classification.h>
+#include <odp/api/abi-default/classification.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/cpumask.h b/include/odp/arch/x86_32-linux/odp/api/abi/cpumask.h
index 56266f8b3a31..d991896d8eea 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/cpumask.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/cpumask.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/cpumask.h>
+#include <odp/api/abi-default/cpumask.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/crypto.h b/include/odp/arch/x86_32-linux/odp/api/abi/crypto.h
index 9a9d2dc1bf8a..d33a777bd345 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/crypto.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/crypto.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/crypto.h>
+#include <odp/api/abi-default/crypto.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/event.h b/include/odp/arch/x86_32-linux/odp/api/abi/event.h
index 5d2ac75e7cb0..cbbf47f1286c 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/event.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/event.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/event.h>
+#include <odp/api/abi-default/event.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/init.h b/include/odp/arch/x86_32-linux/odp/api/abi/init.h
index 86b4852d9902..81eafefe3070 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/init.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/init.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/init.h>
+#include <odp/api/abi-default/init.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h b/include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h
index e392c8ac0bc2..b6747d29ed3e 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/ipsec.h>
+#include <odp/api/abi-default/ipsec.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/packet.h b/include/odp/arch/x86_32-linux/odp/api/abi/packet.h
index f44cb53653b3..ca28eed2adcc 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/packet.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/packet.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/packet.h>
+#include <odp/api/abi-default/packet.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/packet_flags.h b/include/odp/arch/x86_32-linux/odp/api/abi/packet_flags.h
index 08f954aae1ed..a60c8bd07307 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/packet_flags.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/packet_flags.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/packet_flags.h>
+#include <odp/api/abi-default/packet_flags.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/packet_io.h b/include/odp/arch/x86_32-linux/odp/api/abi/packet_io.h
index e80c1452b568..79b49262a98a 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/packet_io.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/packet_io.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/packet_io.h>
+#include <odp/api/abi-default/packet_io.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/pool.h b/include/odp/arch/x86_32-linux/odp/api/abi/pool.h
index b354afbf7282..b59365eb5531 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/pool.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/pool.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/pool.h>
+#include <odp/api/abi-default/pool.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/queue.h b/include/odp/arch/x86_32-linux/odp/api/abi/queue.h
index 6027cee2f8ff..66e2a3415e0b 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/queue.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/queue.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/queue.h>
+#include <odp/api/abi-default/queue.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h b/include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h
index 61faaf76b445..cba0743e74be 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/rwlock.h>
+#include <odp/api/abi-default/rwlock.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h
index ccfdf14aad8b..841710d3c821 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/rwlock_recursive.h>
+#include <odp/api/abi-default/rwlock_recursive.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/schedule.h b/include/odp/arch/x86_32-linux/odp/api/abi/schedule.h
index 82148ca978d5..18427744fc84 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/schedule.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/schedule.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/schedule.h>
+#include <odp/api/abi-default/schedule.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/schedule_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/schedule_types.h
index 1b4f2b316320..b3ea96b5a1d1 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/schedule_types.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/schedule_types.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/schedule_types.h>
+#include <odp/api/abi-default/schedule_types.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/shared_memory.h b/include/odp/arch/x86_32-linux/odp/api/abi/shared_memory.h
index d203678597e8..e80c4f320f83 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/shared_memory.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/shared_memory.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/shared_memory.h>
+#include <odp/api/abi-default/shared_memory.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/spinlock.h b/include/odp/arch/x86_32-linux/odp/api/abi/spinlock.h
index 2e863b014f90..4894095bb08a 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/spinlock.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/spinlock.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/spinlock.h>
+#include <odp/api/abi-default/spinlock.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h
index e90219d901c4..a7a49bd4d1c9 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/spinlock_recursive.h>
+#include <odp/api/abi-default/spinlock_recursive.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/std_clib.h b/include/odp/arch/x86_32-linux/odp/api/abi/std_clib.h
index bda9fd3078fb..72898878a9fe 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/std_clib.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/std_clib.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/std_clib.h>
+#include <odp/api/abi-default/std_clib.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/std_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/std_types.h
index 44fc6f5ae20e..91130000a7f3 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/std_types.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/std_types.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/std_types.h>
+#include <odp/api/abi-default/std_types.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/sync.h b/include/odp/arch/x86_32-linux/odp/api/abi/sync.h
index 2fd45b629040..8e5f813211c0 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/sync.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/sync.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/sync.h>
+#include <odp/api/abi-default/sync.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/thread.h b/include/odp/arch/x86_32-linux/odp/api/abi/thread.h
index 69023d36bb4a..dc29a7dac301 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/thread.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/thread.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/thread.h>
+#include <odp/api/abi-default/thread.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/thrmask.h b/include/odp/arch/x86_32-linux/odp/api/abi/thrmask.h
index 523999dcc087..0c1dc0ce59ad 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/thrmask.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/thrmask.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/thrmask.h>
+#include <odp/api/abi-default/thrmask.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/ticketlock.h b/include/odp/arch/x86_32-linux/odp/api/abi/ticketlock.h
index 160b5e156c9b..0065ce02821c 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/ticketlock.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/ticketlock.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/ticketlock.h>
+#include <odp/api/abi-default/ticketlock.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/time.h b/include/odp/arch/x86_32-linux/odp/api/abi/time.h
index d4d734033c61..2672d7892624 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/time.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/time.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/time.h>
+#include <odp/api/abi-default/time.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/timer.h b/include/odp/arch/x86_32-linux/odp/api/abi/timer.h
index fea797339150..e52a3e12968b 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/timer.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/timer.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/timer.h>
+#include <odp/api/abi-default/timer.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h
index 41d297bce42f..4245cbf7068b 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/traffic_mngr.h>
+#include <odp/api/abi-default/traffic_mngr.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/version.h b/include/odp/arch/x86_32-linux/odp/api/abi/version.h
index 1cdd175edb9a..b36d53958931 100644
--- a/include/odp/arch/x86_32-linux/odp/api/abi/version.h
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/version.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/version.h>
+#include <odp/api/abi-default/version.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/atomic.h b/include/odp/arch/x86_64-linux/odp/api/abi/atomic.h
index 523c614ae2cc..8848ad19f9ba 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/atomic.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/atomic.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/atomic.h>
+#include <odp/api/abi-default/atomic.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/barrier.h b/include/odp/arch/x86_64-linux/odp/api/abi/barrier.h
index 11c3450103ba..9d6c256eb68e 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/barrier.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/barrier.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/barrier.h>
+#include <odp/api/abi-default/barrier.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/buffer.h b/include/odp/arch/x86_64-linux/odp/api/abi/buffer.h
index d9c31930dd3f..68a678964f4b 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/buffer.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/buffer.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/buffer.h>
+#include <odp/api/abi-default/buffer.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/byteorder.h b/include/odp/arch/x86_64-linux/odp/api/abi/byteorder.h
index c76073317844..2fd53414ce01 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/byteorder.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/byteorder.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/byteorder.h>
+#include <odp/api/abi-default/byteorder.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/classification.h b/include/odp/arch/x86_64-linux/odp/api/abi/classification.h
index d48a4733f0c7..5a0cac98f790 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/classification.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/classification.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/classification.h>
+#include <odp/api/abi-default/classification.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/cpumask.h b/include/odp/arch/x86_64-linux/odp/api/abi/cpumask.h
index 56266f8b3a31..d991896d8eea 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/cpumask.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/cpumask.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/cpumask.h>
+#include <odp/api/abi-default/cpumask.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/crypto.h b/include/odp/arch/x86_64-linux/odp/api/abi/crypto.h
index 9a9d2dc1bf8a..d33a777bd345 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/crypto.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/crypto.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/crypto.h>
+#include <odp/api/abi-default/crypto.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/event.h b/include/odp/arch/x86_64-linux/odp/api/abi/event.h
index 5d2ac75e7cb0..cbbf47f1286c 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/event.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/event.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/event.h>
+#include <odp/api/abi-default/event.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/init.h b/include/odp/arch/x86_64-linux/odp/api/abi/init.h
index 86b4852d9902..81eafefe3070 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/init.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/init.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/init.h>
+#include <odp/api/abi-default/init.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h b/include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h
index e392c8ac0bc2..b6747d29ed3e 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/ipsec.h>
+#include <odp/api/abi-default/ipsec.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/packet.h b/include/odp/arch/x86_64-linux/odp/api/abi/packet.h
index f44cb53653b3..ca28eed2adcc 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/packet.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/packet.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/packet.h>
+#include <odp/api/abi-default/packet.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/packet_flags.h b/include/odp/arch/x86_64-linux/odp/api/abi/packet_flags.h
index 08f954aae1ed..a60c8bd07307 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/packet_flags.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/packet_flags.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/packet_flags.h>
+#include <odp/api/abi-default/packet_flags.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/packet_io.h b/include/odp/arch/x86_64-linux/odp/api/abi/packet_io.h
index e80c1452b568..79b49262a98a 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/packet_io.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/packet_io.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/packet_io.h>
+#include <odp/api/abi-default/packet_io.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/pool.h b/include/odp/arch/x86_64-linux/odp/api/abi/pool.h
index b354afbf7282..b59365eb5531 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/pool.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/pool.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/pool.h>
+#include <odp/api/abi-default/pool.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/queue.h b/include/odp/arch/x86_64-linux/odp/api/abi/queue.h
index 6027cee2f8ff..66e2a3415e0b 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/queue.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/queue.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/queue.h>
+#include <odp/api/abi-default/queue.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h b/include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h
index 61faaf76b445..cba0743e74be 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/rwlock.h>
+#include <odp/api/abi-default/rwlock.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h
index ccfdf14aad8b..841710d3c821 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/rwlock_recursive.h>
+#include <odp/api/abi-default/rwlock_recursive.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/schedule.h b/include/odp/arch/x86_64-linux/odp/api/abi/schedule.h
index 82148ca978d5..18427744fc84 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/schedule.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/schedule.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/schedule.h>
+#include <odp/api/abi-default/schedule.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/schedule_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/schedule_types.h
index 1b4f2b316320..b3ea96b5a1d1 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/schedule_types.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/schedule_types.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/schedule_types.h>
+#include <odp/api/abi-default/schedule_types.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/shared_memory.h b/include/odp/arch/x86_64-linux/odp/api/abi/shared_memory.h
index d203678597e8..e80c4f320f83 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/shared_memory.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/shared_memory.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/shared_memory.h>
+#include <odp/api/abi-default/shared_memory.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/spinlock.h b/include/odp/arch/x86_64-linux/odp/api/abi/spinlock.h
index 2e863b014f90..4894095bb08a 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/spinlock.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/spinlock.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/spinlock.h>
+#include <odp/api/abi-default/spinlock.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h
index e90219d901c4..a7a49bd4d1c9 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/spinlock_recursive.h>
+#include <odp/api/abi-default/spinlock_recursive.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/std_clib.h b/include/odp/arch/x86_64-linux/odp/api/abi/std_clib.h
index bda9fd3078fb..72898878a9fe 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/std_clib.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/std_clib.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/std_clib.h>
+#include <odp/api/abi-default/std_clib.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/std_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/std_types.h
index 44fc6f5ae20e..91130000a7f3 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/std_types.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/std_types.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/std_types.h>
+#include <odp/api/abi-default/std_types.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/sync.h b/include/odp/arch/x86_64-linux/odp/api/abi/sync.h
index 2fd45b629040..8e5f813211c0 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/sync.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/sync.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/sync.h>
+#include <odp/api/abi-default/sync.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/thread.h b/include/odp/arch/x86_64-linux/odp/api/abi/thread.h
index 69023d36bb4a..dc29a7dac301 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/thread.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/thread.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/thread.h>
+#include <odp/api/abi-default/thread.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/thrmask.h b/include/odp/arch/x86_64-linux/odp/api/abi/thrmask.h
index 523999dcc087..0c1dc0ce59ad 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/thrmask.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/thrmask.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/thrmask.h>
+#include <odp/api/abi-default/thrmask.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/ticketlock.h b/include/odp/arch/x86_64-linux/odp/api/abi/ticketlock.h
index 160b5e156c9b..0065ce02821c 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/ticketlock.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/ticketlock.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/ticketlock.h>
+#include <odp/api/abi-default/ticketlock.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/time.h b/include/odp/arch/x86_64-linux/odp/api/abi/time.h
index d4d734033c61..2672d7892624 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/time.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/time.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/time.h>
+#include <odp/api/abi-default/time.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/timer.h b/include/odp/arch/x86_64-linux/odp/api/abi/timer.h
index fea797339150..e52a3e12968b 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/timer.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/timer.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/timer.h>
+#include <odp/api/abi-default/timer.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h
index 41d297bce42f..4245cbf7068b 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/traffic_mngr.h>
+#include <odp/api/abi-default/traffic_mngr.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/version.h b/include/odp/arch/x86_64-linux/odp/api/abi/version.h
index 1cdd175edb9a..b36d53958931 100644
--- a/include/odp/arch/x86_64-linux/odp/api/abi/version.h
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/version.h
@@ -4,4 +4,4 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/arch/default/api/abi/version.h>
+#include <odp/api/abi-default/version.h>
