aboutsummaryrefslogtreecommitdiff
path: root/include/odp/arch
diff options
context:
space:
mode:
Diffstat (limited to 'include/odp/arch')
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/align.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/atomic.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/barrier.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/buffer.h8
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/buffer_types.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/byteorder.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/classification.h8
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/comp.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/cpu.h18
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/cpumask.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/crypto.h8
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/crypto_types.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/debug.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/dma.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/dma_types.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/errno.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/event.h8
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/event_types.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/hash.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/init.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/ipsec.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/ipsec_types.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/ml_types.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/packet.h8
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/packet_flags.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/packet_io.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/packet_io_types.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/packet_types.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/pool.h8
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/pool_types.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/proto_stats.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/proto_stats_types.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/queue.h8
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/queue_types.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/random.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/rwlock.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/schedule.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/schedule_types.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/shared_memory.h8
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/spinlock.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/stash.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/stash_types.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/std.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/std_types.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/sync.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/thread.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/thread_types.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/thrmask.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/ticketlock.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/time.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/time_types.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/timer.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/timer_types.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h5
-rw-r--r--include/odp/arch/arm32-linux/odp/api/abi/version.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/align.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/atomic.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/barrier.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/buffer.h8
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/buffer_types.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/byteorder.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/classification.h8
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/comp.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/cpu.h18
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/cpumask.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/crypto.h8
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/crypto_types.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/debug.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/dma.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/dma_types.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/errno.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/event.h8
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/event_types.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/hash.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/init.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/ipsec.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/ipsec_types.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/ml_types.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/packet.h8
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/packet_flags.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/packet_io.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/packet_io_types.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/packet_types.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/pool.h8
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/pool_types.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/proto_stats.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/proto_stats_types.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/queue.h8
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/queue_types.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/random.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/rwlock.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/schedule.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/schedule_types.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/shared_memory.h8
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/spinlock.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/stash.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/stash_types.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/std.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/std_types.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/sync.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/thread.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/thread_types.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/thrmask.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/ticketlock.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/time.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/time_types.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/timer.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/timer_types.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h5
-rw-r--r--include/odp/arch/arm64-linux/odp/api/abi/version.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/align.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/atomic.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/barrier.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/buffer.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/buffer_types.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/byteorder.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/classification.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/comp.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/cpu.h18
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/cpumask.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/crypto.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/crypto_types.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/debug.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/dma.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/dma_types.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/errno.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/event.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/event_types.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/hash.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/init.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/ipsec.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/ipsec_types.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/ml_types.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/packet.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/packet_flags.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/packet_io.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/packet_io_types.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/packet_types.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/pool.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/pool_types.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/proto_stats.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/proto_stats_types.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/queue.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/queue_types.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/random.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/rwlock.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/rwlock_recursive.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/schedule.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/schedule_types.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/shared_memory.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/spinlock.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/spinlock_recursive.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/stash.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/stash_types.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/std.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/std_types.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/sync.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/thread.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/thread_types.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/thrmask.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/ticketlock.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/time.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/time_types.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/timer.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/timer_types.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/traffic_mngr.h5
-rw-r--r--include/odp/arch/default-linux/odp/api/abi/version.h5
-rw-r--r--include/odp/arch/default/api/abi/buffer.h38
-rw-r--r--include/odp/arch/default/api/abi/classification.h40
-rw-r--r--include/odp/arch/default/api/abi/crypto.h36
-rw-r--r--include/odp/arch/default/api/abi/event.h42
-rw-r--r--include/odp/arch/default/api/abi/packet.h50
-rw-r--r--include/odp/arch/default/api/abi/pool.h43
-rw-r--r--include/odp/arch/default/api/abi/queue.h35
-rw-r--r--include/odp/arch/default/api/abi/shared_memory.h35
-rw-r--r--include/odp/arch/mips64-linux/odp/api/abi/buffer.h7
-rw-r--r--include/odp/arch/mips64-linux/odp/api/abi/classification.h7
-rw-r--r--include/odp/arch/mips64-linux/odp/api/abi/crypto.h7
-rw-r--r--include/odp/arch/mips64-linux/odp/api/abi/event.h7
-rw-r--r--include/odp/arch/mips64-linux/odp/api/abi/packet.h7
-rw-r--r--include/odp/arch/mips64-linux/odp/api/abi/pool.h7
-rw-r--r--include/odp/arch/mips64-linux/odp/api/abi/queue.h7
-rw-r--r--include/odp/arch/mips64-linux/odp/api/abi/shared_memory.h7
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/align.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/atomic.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/barrier.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/buffer.h8
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/buffer_types.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/byteorder.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/classification.h8
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/comp.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/cpu.h19
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/cpumask.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/crypto.h8
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/crypto_types.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/debug.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/dma.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/dma_types.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/errno.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/event.h8
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/event_types.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/hash.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/init.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/ipsec.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/ipsec_types.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/ml_types.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/packet.h8
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/packet_flags.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/packet_io.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/packet_io_types.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/packet_types.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/pool.h8
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/pool_types.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/proto_stats.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/proto_stats_types.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/queue.h8
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/queue_types.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/random.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/rwlock.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/schedule.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/schedule_types.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/shared_memory.h8
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/spinlock.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/stash.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/stash_types.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/std.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/std_types.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/sync.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/thread.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/thread_types.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/thrmask.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/ticketlock.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/time.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/time_types.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/timer.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/timer_types.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/traffic_mngr.h5
-rw-r--r--include/odp/arch/power64-linux/odp/api/abi/version.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/align.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/atomic.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/barrier.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/buffer.h8
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/buffer_types.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/byteorder.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/classification.h8
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/comp.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/cpu.h18
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/cpumask.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/crypto.h8
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/crypto_types.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/debug.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/dma.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/dma_types.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/errno.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/event.h8
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/event_types.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/hash.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/init.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/ipsec_types.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/ml_types.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/packet.h8
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/packet_flags.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/packet_io.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/packet_io_types.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/packet_types.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/pool.h8
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/pool_types.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/proto_stats.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/proto_stats_types.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/queue.h8
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/queue_types.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/random.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/schedule.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/schedule_types.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/shared_memory.h8
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/spinlock.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/stash.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/stash_types.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/std.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/std_types.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/sync.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/thread.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/thread_types.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/thrmask.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/ticketlock.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/time.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/time_types.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/timer.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/timer_types.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h5
-rw-r--r--include/odp/arch/x86_32-linux/odp/api/abi/version.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/align.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/atomic.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/barrier.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/buffer.h8
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/buffer_types.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/byteorder.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/classification.h8
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/comp.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/cpu.h18
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/cpumask.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/crypto.h8
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/crypto_types.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/debug.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/dma.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/dma_types.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/errno.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/event.h8
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/event_types.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/hash.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/init.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/ipsec_types.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/ml_types.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/packet.h8
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/packet_flags.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/packet_io.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/packet_io_types.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/packet_types.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/pool.h8
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/pool_types.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/proto_stats.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/proto_stats_types.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/queue.h8
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/queue_types.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/random.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/schedule.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/schedule_types.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/shared_memory.h8
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/spinlock.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/stash.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/stash_types.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/std.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/std_types.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/sync.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/thread.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/thread_types.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/thrmask.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/ticketlock.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/time.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/time_types.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/timer.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/timer_types.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h5
-rw-r--r--include/odp/arch/x86_64-linux/odp/api/abi/version.h5
358 files changed, 1709 insertions, 575 deletions
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/align.h b/include/odp/arch/arm32-linux/odp/api/abi/align.h
new file mode 100644
index 000000000..aa8f2eab7
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/align.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/align.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
new file mode 100644
index 000000000..ab7c3f17b
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/atomic.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..c3388fd2a
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/barrier.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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 d9c31930d..2ffa07d1f 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/buffer.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/buffer.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/buffer_types.h b/include/odp/arch/arm32-linux/odp/api/abi/buffer_types.h
new file mode 100644
index 000000000..331e123c7
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/buffer_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/buffer_types.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
new file mode 100644
index 000000000..9c9728840
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/byteorder.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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 d48a4733f..789f3a92a 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/classification.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/classification.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/comp.h b/include/odp/arch/arm32-linux/odp/api/abi/comp.h
new file mode 100644
index 000000000..7b4be9d3e
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/comp.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/comp.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/cpu.h b/include/odp/arch/arm32-linux/odp/api/abi/cpu.h
new file mode 100644
index 000000000..575f4a5ec
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/cpu.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2016-2018 Linaro Limited
+ */
+
+#ifndef ODP_API_ABI_CPU_H_
+#define ODP_API_ABI_CPU_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ODP_CACHE_LINE_SIZE 64
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/cpumask.h b/include/odp/arch/arm32-linux/odp/api/abi/cpumask.h
new file mode 100644
index 000000000..696f8664f
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/cpumask.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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 9a9d2dc1b..9d39ba7bc 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/crypto.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/crypto.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/crypto_types.h b/include/odp/arch/arm32-linux/odp/api/abi/crypto_types.h
new file mode 100644
index 000000000..7e1da759a
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/crypto_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/crypto_types.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/debug.h b/include/odp/arch/arm32-linux/odp/api/abi/debug.h
new file mode 100644
index 000000000..8a2ef2ade
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/debug.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/debug.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/dma.h b/include/odp/arch/arm32-linux/odp/api/abi/dma.h
new file mode 100644
index 000000000..f5e42a076
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/dma.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/dma.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/dma_types.h b/include/odp/arch/arm32-linux/odp/api/abi/dma_types.h
new file mode 100644
index 000000000..cd96b9933
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/dma_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/dma_types.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/errno.h b/include/odp/arch/arm32-linux/odp/api/abi/errno.h
new file mode 100644
index 000000000..9d197a8d4
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/errno.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2020 Marvell
+ */
+
+#include <odp/api/abi-default/errno.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 5d2ac75e7..6f7074bb1 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/event.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/event.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/event_types.h b/include/odp/arch/arm32-linux/odp/api/abi/event_types.h
new file mode 100644
index 000000000..ece9cbef0
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/event_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/event_types.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/hash.h b/include/odp/arch/arm32-linux/odp/api/abi/hash.h
new file mode 100644
index 000000000..72431f765
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/hash.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2020 Marvell
+ */
+
+#include <odp/api/abi-default/hash.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
new file mode 100644
index 000000000..936644f46
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/init.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..33c03cbe2
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/ipsec.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/ipsec.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/ipsec_types.h b/include/odp/arch/arm32-linux/odp/api/abi/ipsec_types.h
new file mode 100644
index 000000000..854e7aa01
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/ipsec_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/ipsec_types.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/ml_types.h b/include/odp/arch/arm32-linux/odp/api/abi/ml_types.h
new file mode 100644
index 000000000..4201f92e6
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/ml_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/ml_types.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 f44cb5365..9d560e6c8 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/packet.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/packet.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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
new file mode 100644
index 000000000..598047d96
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/packet_flags.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..4356eb007
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/packet_io.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/packet_io.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/packet_io_types.h b/include/odp/arch/arm32-linux/odp/api/abi/packet_io_types.h
new file mode 100644
index 000000000..3e8962f6a
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/packet_io_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/packet_io_types.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/packet_types.h b/include/odp/arch/arm32-linux/odp/api/abi/packet_types.h
new file mode 100644
index 000000000..9af00c158
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/packet_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/packet_types.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 b354afbf7..2f2e9164f 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/pool.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/pool.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/pool_types.h b/include/odp/arch/arm32-linux/odp/api/abi/pool_types.h
new file mode 100644
index 000000000..a8366b5d2
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/pool_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/pool_types.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/proto_stats.h b/include/odp/arch/arm32-linux/odp/api/abi/proto_stats.h
new file mode 100644
index 000000000..81108faa5
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/proto_stats.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#include <odp/api/abi-default/proto_stats.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/proto_stats_types.h b/include/odp/arch/arm32-linux/odp/api/abi/proto_stats_types.h
new file mode 100644
index 000000000..f6884a40a
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/proto_stats_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/proto_stats_types.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 6027cee2f..2ba9174d0 100644
--- a/include/odp/arch/arm32-linux/odp/api/abi/queue.h
+++ b/include/odp/arch/arm32-linux/odp/api/abi/queue.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/queue_types.h b/include/odp/arch/arm32-linux/odp/api/abi/queue_types.h
new file mode 100644
index 000000000..f1a8e197d
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/queue_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/queue_types.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/random.h b/include/odp/arch/arm32-linux/odp/api/abi/random.h
new file mode 100644
index 000000000..703dcf5a0
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/random.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/random.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
new file mode 100644
index 000000000..5f953d6f6
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/rwlock.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..f10116aeb
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/rwlock_recursive.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..cd16a1161
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/schedule.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..1b2990c2b
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/schedule_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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 d20367859..7ba8a2248 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
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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
new file mode 100644
index 000000000..c626baae5
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/spinlock.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..6794590ca
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/spinlock_recursive.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/spinlock_recursive.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/stash.h b/include/odp/arch/arm32-linux/odp/api/abi/stash.h
new file mode 100644
index 000000000..ed2cbbc64
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/stash.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2020 Nokia
+ */
+
+#include <odp/api/abi-default/stash.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/stash_types.h b/include/odp/arch/arm32-linux/odp/api/abi/stash_types.h
new file mode 100644
index 000000000..0f2759726
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/stash_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/stash_types.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/std.h b/include/odp/arch/arm32-linux/odp/api/abi/std.h
new file mode 100644
index 000000000..936009922
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/std.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/std.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
new file mode 100644
index 000000000..c0d930e1f
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/std_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..dbe3a95ab
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/sync.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..b6a233c96
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/thread.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/thread.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/thread_types.h b/include/odp/arch/arm32-linux/odp/api/abi/thread_types.h
new file mode 100644
index 000000000..e695c233b
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/thread_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/thread_types.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
new file mode 100644
index 000000000..2bb61d233
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/thrmask.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..4317157b8
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/ticketlock.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..0f2425669
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/time.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/time.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/time_types.h b/include/odp/arch/arm32-linux/odp/api/abi/time_types.h
new file mode 100644
index 000000000..a415200a0
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/time_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/time_types.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
new file mode 100644
index 000000000..0d7965bf7
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/timer.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/timer.h>
diff --git a/include/odp/arch/arm32-linux/odp/api/abi/timer_types.h b/include/odp/arch/arm32-linux/odp/api/abi/timer_types.h
new file mode 100644
index 000000000..51b578aa7
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/timer_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/timer_types.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
new file mode 100644
index 000000000..9a457c370
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/traffic_mngr.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..cf4b9a128
--- /dev/null
+++ b/include/odp/arch/arm32-linux/odp/api/abi/version.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/version.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/align.h b/include/odp/arch/arm64-linux/odp/api/abi/align.h
new file mode 100644
index 000000000..aa8f2eab7
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/align.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/align.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
new file mode 100644
index 000000000..ab7c3f17b
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/atomic.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..c3388fd2a
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/barrier.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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 d9c31930d..2ffa07d1f 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/buffer.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/buffer.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/buffer_types.h b/include/odp/arch/arm64-linux/odp/api/abi/buffer_types.h
new file mode 100644
index 000000000..331e123c7
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/buffer_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/buffer_types.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
new file mode 100644
index 000000000..9c9728840
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/byteorder.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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 d48a4733f..789f3a92a 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/classification.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/classification.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/comp.h b/include/odp/arch/arm64-linux/odp/api/abi/comp.h
new file mode 100644
index 000000000..7b4be9d3e
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/comp.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/comp.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/cpu.h b/include/odp/arch/arm64-linux/odp/api/abi/cpu.h
new file mode 100644
index 000000000..575f4a5ec
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/cpu.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2016-2018 Linaro Limited
+ */
+
+#ifndef ODP_API_ABI_CPU_H_
+#define ODP_API_ABI_CPU_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ODP_CACHE_LINE_SIZE 64
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/cpumask.h b/include/odp/arch/arm64-linux/odp/api/abi/cpumask.h
new file mode 100644
index 000000000..696f8664f
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/cpumask.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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 9a9d2dc1b..9d39ba7bc 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/crypto.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/crypto.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/crypto_types.h b/include/odp/arch/arm64-linux/odp/api/abi/crypto_types.h
new file mode 100644
index 000000000..7e1da759a
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/crypto_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/crypto_types.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/debug.h b/include/odp/arch/arm64-linux/odp/api/abi/debug.h
new file mode 100644
index 000000000..8a2ef2ade
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/debug.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/debug.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/dma.h b/include/odp/arch/arm64-linux/odp/api/abi/dma.h
new file mode 100644
index 000000000..f5e42a076
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/dma.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/dma.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/dma_types.h b/include/odp/arch/arm64-linux/odp/api/abi/dma_types.h
new file mode 100644
index 000000000..cd96b9933
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/dma_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/dma_types.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/errno.h b/include/odp/arch/arm64-linux/odp/api/abi/errno.h
new file mode 100644
index 000000000..9d197a8d4
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/errno.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2020 Marvell
+ */
+
+#include <odp/api/abi-default/errno.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 5d2ac75e7..6f7074bb1 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/event.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/event.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/event_types.h b/include/odp/arch/arm64-linux/odp/api/abi/event_types.h
new file mode 100644
index 000000000..ece9cbef0
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/event_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/event_types.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/hash.h b/include/odp/arch/arm64-linux/odp/api/abi/hash.h
new file mode 100644
index 000000000..72431f765
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/hash.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2020 Marvell
+ */
+
+#include <odp/api/abi-default/hash.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
new file mode 100644
index 000000000..936644f46
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/init.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..33c03cbe2
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/ipsec.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/ipsec.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/ipsec_types.h b/include/odp/arch/arm64-linux/odp/api/abi/ipsec_types.h
new file mode 100644
index 000000000..854e7aa01
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/ipsec_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/ipsec_types.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/ml_types.h b/include/odp/arch/arm64-linux/odp/api/abi/ml_types.h
new file mode 100644
index 000000000..4201f92e6
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/ml_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/ml_types.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 f44cb5365..9d560e6c8 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/packet.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/packet.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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
new file mode 100644
index 000000000..598047d96
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/packet_flags.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..4356eb007
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/packet_io.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/packet_io.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/packet_io_types.h b/include/odp/arch/arm64-linux/odp/api/abi/packet_io_types.h
new file mode 100644
index 000000000..3e8962f6a
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/packet_io_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/packet_io_types.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/packet_types.h b/include/odp/arch/arm64-linux/odp/api/abi/packet_types.h
new file mode 100644
index 000000000..9af00c158
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/packet_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/packet_types.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 b354afbf7..2f2e9164f 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/pool.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/pool.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/pool_types.h b/include/odp/arch/arm64-linux/odp/api/abi/pool_types.h
new file mode 100644
index 000000000..a8366b5d2
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/pool_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/pool_types.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/proto_stats.h b/include/odp/arch/arm64-linux/odp/api/abi/proto_stats.h
new file mode 100644
index 000000000..81108faa5
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/proto_stats.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#include <odp/api/abi-default/proto_stats.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/proto_stats_types.h b/include/odp/arch/arm64-linux/odp/api/abi/proto_stats_types.h
new file mode 100644
index 000000000..f6884a40a
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/proto_stats_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/proto_stats_types.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 6027cee2f..2ba9174d0 100644
--- a/include/odp/arch/arm64-linux/odp/api/abi/queue.h
+++ b/include/odp/arch/arm64-linux/odp/api/abi/queue.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/queue_types.h b/include/odp/arch/arm64-linux/odp/api/abi/queue_types.h
new file mode 100644
index 000000000..f1a8e197d
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/queue_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/queue_types.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/random.h b/include/odp/arch/arm64-linux/odp/api/abi/random.h
new file mode 100644
index 000000000..703dcf5a0
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/random.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/random.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
new file mode 100644
index 000000000..5f953d6f6
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/rwlock.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..f10116aeb
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/rwlock_recursive.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..cd16a1161
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/schedule.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..1b2990c2b
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/schedule_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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 d20367859..7ba8a2248 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
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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
new file mode 100644
index 000000000..c626baae5
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/spinlock.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..6794590ca
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/spinlock_recursive.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/spinlock_recursive.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/stash.h b/include/odp/arch/arm64-linux/odp/api/abi/stash.h
new file mode 100644
index 000000000..ed2cbbc64
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/stash.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2020 Nokia
+ */
+
+#include <odp/api/abi-default/stash.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/stash_types.h b/include/odp/arch/arm64-linux/odp/api/abi/stash_types.h
new file mode 100644
index 000000000..0f2759726
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/stash_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/stash_types.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/std.h b/include/odp/arch/arm64-linux/odp/api/abi/std.h
new file mode 100644
index 000000000..936009922
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/std.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/std.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
new file mode 100644
index 000000000..c0d930e1f
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/std_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..dbe3a95ab
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/sync.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..b6a233c96
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/thread.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/thread.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/thread_types.h b/include/odp/arch/arm64-linux/odp/api/abi/thread_types.h
new file mode 100644
index 000000000..e695c233b
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/thread_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/thread_types.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
new file mode 100644
index 000000000..2bb61d233
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/thrmask.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..4317157b8
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/ticketlock.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..0f2425669
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/time.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/time.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/time_types.h b/include/odp/arch/arm64-linux/odp/api/abi/time_types.h
new file mode 100644
index 000000000..a415200a0
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/time_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/time_types.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
new file mode 100644
index 000000000..0d7965bf7
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/timer.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/timer.h>
diff --git a/include/odp/arch/arm64-linux/odp/api/abi/timer_types.h b/include/odp/arch/arm64-linux/odp/api/abi/timer_types.h
new file mode 100644
index 000000000..51b578aa7
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/timer_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/timer_types.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
new file mode 100644
index 000000000..9a457c370
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/traffic_mngr.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..cf4b9a128
--- /dev/null
+++ b/include/odp/arch/arm64-linux/odp/api/abi/version.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/version.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/align.h b/include/odp/arch/default-linux/odp/api/abi/align.h
new file mode 100644
index 000000000..d5b26ba72
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/align.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/align.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/atomic.h b/include/odp/arch/default-linux/odp/api/abi/atomic.h
new file mode 100644
index 000000000..6645faf14
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/atomic.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/atomic.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/barrier.h b/include/odp/arch/default-linux/odp/api/abi/barrier.h
new file mode 100644
index 000000000..23537289c
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/barrier.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/barrier.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/buffer.h b/include/odp/arch/default-linux/odp/api/abi/buffer.h
new file mode 100644
index 000000000..092054239
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/buffer.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/buffer.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/buffer_types.h b/include/odp/arch/default-linux/odp/api/abi/buffer_types.h
new file mode 100644
index 000000000..331e123c7
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/buffer_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/buffer_types.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/byteorder.h b/include/odp/arch/default-linux/odp/api/abi/byteorder.h
new file mode 100644
index 000000000..479077adb
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/byteorder.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/byteorder.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/classification.h b/include/odp/arch/default-linux/odp/api/abi/classification.h
new file mode 100644
index 000000000..7eccb6819
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/classification.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/classification.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/comp.h b/include/odp/arch/default-linux/odp/api/abi/comp.h
new file mode 100644
index 000000000..7b4be9d3e
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/comp.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/comp.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/cpu.h b/include/odp/arch/default-linux/odp/api/abi/cpu.h
new file mode 100644
index 000000000..575f4a5ec
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/cpu.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2016-2018 Linaro Limited
+ */
+
+#ifndef ODP_API_ABI_CPU_H_
+#define ODP_API_ABI_CPU_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ODP_CACHE_LINE_SIZE 64
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/include/odp/arch/default-linux/odp/api/abi/cpumask.h b/include/odp/arch/default-linux/odp/api/abi/cpumask.h
new file mode 100644
index 000000000..c14cd36ba
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/cpumask.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/cpumask.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/crypto.h b/include/odp/arch/default-linux/odp/api/abi/crypto.h
new file mode 100644
index 000000000..1fc496fdd
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/crypto.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/crypto.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/crypto_types.h b/include/odp/arch/default-linux/odp/api/abi/crypto_types.h
new file mode 100644
index 000000000..7e1da759a
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/crypto_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/crypto_types.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/debug.h b/include/odp/arch/default-linux/odp/api/abi/debug.h
new file mode 100644
index 000000000..59d18a02d
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/debug.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/debug.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/dma.h b/include/odp/arch/default-linux/odp/api/abi/dma.h
new file mode 100644
index 000000000..f5e42a076
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/dma.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/dma.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/dma_types.h b/include/odp/arch/default-linux/odp/api/abi/dma_types.h
new file mode 100644
index 000000000..cd96b9933
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/dma_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/dma_types.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/errno.h b/include/odp/arch/default-linux/odp/api/abi/errno.h
new file mode 100644
index 000000000..9d197a8d4
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/errno.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2020 Marvell
+ */
+
+#include <odp/api/abi-default/errno.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/event.h b/include/odp/arch/default-linux/odp/api/abi/event.h
new file mode 100644
index 000000000..5e6286ebd
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/event.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/event.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/event_types.h b/include/odp/arch/default-linux/odp/api/abi/event_types.h
new file mode 100644
index 000000000..ece9cbef0
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/event_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/event_types.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/hash.h b/include/odp/arch/default-linux/odp/api/abi/hash.h
new file mode 100644
index 000000000..72431f765
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/hash.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2020 Marvell
+ */
+
+#include <odp/api/abi-default/hash.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/init.h b/include/odp/arch/default-linux/odp/api/abi/init.h
new file mode 100644
index 000000000..babb44bad
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/init.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/init.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/ipsec.h b/include/odp/arch/default-linux/odp/api/abi/ipsec.h
new file mode 100644
index 000000000..877515add
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/ipsec.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/ipsec.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/ipsec_types.h b/include/odp/arch/default-linux/odp/api/abi/ipsec_types.h
new file mode 100644
index 000000000..854e7aa01
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/ipsec_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/ipsec_types.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/ml_types.h b/include/odp/arch/default-linux/odp/api/abi/ml_types.h
new file mode 100644
index 000000000..4201f92e6
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/ml_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/ml_types.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/packet.h b/include/odp/arch/default-linux/odp/api/abi/packet.h
new file mode 100644
index 000000000..8cee03484
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/packet.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/packet.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/packet_flags.h b/include/odp/arch/default-linux/odp/api/abi/packet_flags.h
new file mode 100644
index 000000000..00afba64c
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/packet_flags.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/packet_flags.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/packet_io.h b/include/odp/arch/default-linux/odp/api/abi/packet_io.h
new file mode 100644
index 000000000..107a480dd
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/packet_io.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/packet_io.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/packet_io_types.h b/include/odp/arch/default-linux/odp/api/abi/packet_io_types.h
new file mode 100644
index 000000000..3e8962f6a
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/packet_io_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/packet_io_types.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/packet_types.h b/include/odp/arch/default-linux/odp/api/abi/packet_types.h
new file mode 100644
index 000000000..9af00c158
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/packet_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/packet_types.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/pool.h b/include/odp/arch/default-linux/odp/api/abi/pool.h
new file mode 100644
index 000000000..9c5d5d4fe
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/pool.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/pool.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/pool_types.h b/include/odp/arch/default-linux/odp/api/abi/pool_types.h
new file mode 100644
index 000000000..a8366b5d2
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/pool_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/pool_types.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/proto_stats.h b/include/odp/arch/default-linux/odp/api/abi/proto_stats.h
new file mode 100644
index 000000000..81108faa5
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/proto_stats.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#include <odp/api/abi-default/proto_stats.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/proto_stats_types.h b/include/odp/arch/default-linux/odp/api/abi/proto_stats_types.h
new file mode 100644
index 000000000..f6884a40a
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/proto_stats_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/proto_stats_types.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/queue.h b/include/odp/arch/default-linux/odp/api/abi/queue.h
new file mode 100644
index 000000000..352885307
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/queue.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/queue.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/queue_types.h b/include/odp/arch/default-linux/odp/api/abi/queue_types.h
new file mode 100644
index 000000000..f1a8e197d
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/queue_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/queue_types.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/random.h b/include/odp/arch/default-linux/odp/api/abi/random.h
new file mode 100644
index 000000000..703dcf5a0
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/random.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/random.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/rwlock.h b/include/odp/arch/default-linux/odp/api/abi/rwlock.h
new file mode 100644
index 000000000..e77c35549
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/rwlock.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/rwlock.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/rwlock_recursive.h b/include/odp/arch/default-linux/odp/api/abi/rwlock_recursive.h
new file mode 100644
index 000000000..b347e9c87
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/rwlock_recursive.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/rwlock_recursive.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/schedule.h b/include/odp/arch/default-linux/odp/api/abi/schedule.h
new file mode 100644
index 000000000..3c00f79da
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/schedule.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/schedule.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/schedule_types.h b/include/odp/arch/default-linux/odp/api/abi/schedule_types.h
new file mode 100644
index 000000000..2731cfbb7
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/schedule_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/schedule_types.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/shared_memory.h b/include/odp/arch/default-linux/odp/api/abi/shared_memory.h
new file mode 100644
index 000000000..ddf32054c
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/shared_memory.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/shared_memory.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/spinlock.h b/include/odp/arch/default-linux/odp/api/abi/spinlock.h
new file mode 100644
index 000000000..8fe21357d
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/spinlock.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/spinlock.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/spinlock_recursive.h b/include/odp/arch/default-linux/odp/api/abi/spinlock_recursive.h
new file mode 100644
index 000000000..366c181ec
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/spinlock_recursive.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/spinlock_recursive.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/stash.h b/include/odp/arch/default-linux/odp/api/abi/stash.h
new file mode 100644
index 000000000..ed2cbbc64
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/stash.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2020 Nokia
+ */
+
+#include <odp/api/abi-default/stash.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/stash_types.h b/include/odp/arch/default-linux/odp/api/abi/stash_types.h
new file mode 100644
index 000000000..0f2759726
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/stash_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/stash_types.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/std.h b/include/odp/arch/default-linux/odp/api/abi/std.h
new file mode 100644
index 000000000..ae8d69371
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/std.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/std.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/std_types.h b/include/odp/arch/default-linux/odp/api/abi/std_types.h
new file mode 100644
index 000000000..3d011d980
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/std_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/std_types.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/sync.h b/include/odp/arch/default-linux/odp/api/abi/sync.h
new file mode 100644
index 000000000..e6d26db02
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/sync.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/sync.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/thread.h b/include/odp/arch/default-linux/odp/api/abi/thread.h
new file mode 100644
index 000000000..26b2f6be0
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/thread.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/thread.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/thread_types.h b/include/odp/arch/default-linux/odp/api/abi/thread_types.h
new file mode 100644
index 000000000..e695c233b
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/thread_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/thread_types.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/thrmask.h b/include/odp/arch/default-linux/odp/api/abi/thrmask.h
new file mode 100644
index 000000000..305be2ca4
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/thrmask.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/thrmask.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/ticketlock.h b/include/odp/arch/default-linux/odp/api/abi/ticketlock.h
new file mode 100644
index 000000000..53d4fa04a
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/ticketlock.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/ticketlock.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/time.h b/include/odp/arch/default-linux/odp/api/abi/time.h
new file mode 100644
index 000000000..1b61b9e8d
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/time.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/time.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/time_types.h b/include/odp/arch/default-linux/odp/api/abi/time_types.h
new file mode 100644
index 000000000..a415200a0
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/time_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/time_types.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/timer.h b/include/odp/arch/default-linux/odp/api/abi/timer.h
new file mode 100644
index 000000000..0d7965bf7
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/timer.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/timer.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/timer_types.h b/include/odp/arch/default-linux/odp/api/abi/timer_types.h
new file mode 100644
index 000000000..40fd26343
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/timer_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/timer_types.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/traffic_mngr.h b/include/odp/arch/default-linux/odp/api/abi/traffic_mngr.h
new file mode 100644
index 000000000..8904e4291
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/traffic_mngr.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/traffic_mngr.h>
diff --git a/include/odp/arch/default-linux/odp/api/abi/version.h b/include/odp/arch/default-linux/odp/api/abi/version.h
new file mode 100644
index 000000000..3249a2e26
--- /dev/null
+++ b/include/odp/arch/default-linux/odp/api/abi/version.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/version.h>
diff --git a/include/odp/arch/default/api/abi/buffer.h b/include/odp/arch/default/api/abi/buffer.h
deleted file mode 100644
index eec6f01f2..000000000
--- a/include/odp/arch/default/api/abi/buffer.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef ODP_ABI_BUFFER_H_
-#define ODP_ABI_BUFFER_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @internal Dummy type for strong typing */
-typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_buffer_t;
-
-/** @internal Dummy type for strong typing */
-typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_buffer_seg_t;
-
-/** @ingroup odp_buffer
- * @{
- */
-
-typedef _odp_abi_buffer_t *odp_buffer_t;
-typedef _odp_abi_buffer_seg_t *odp_buffer_seg_t;
-
-#define ODP_BUFFER_INVALID ((odp_buffer_t)0xffffffff)
-#define ODP_SEGMENT_INVALID ((odp_buffer_seg_t)0xffffffff)
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/odp/arch/default/api/abi/classification.h b/include/odp/arch/default/api/abi/classification.h
deleted file mode 100644
index 771907aec..000000000
--- a/include/odp/arch/default/api/abi/classification.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef ODP_ABI_CLASSIFICATION_H_
-#define ODP_ABI_CLASSIFICATION_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @internal Dummy type for strong typing */
-typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_cos_t;
-
-/** Dummy type for strong typing */
-typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_pmr_t;
-
-/** @ingroup odp_classification
- * @{
- */
-
-typedef _odp_abi_cos_t *odp_cos_t;
-typedef _odp_abi_pmr_t *odp_pmr_t;
-
-#define ODP_COS_INVALID ((odp_cos_t)~0)
-#define ODP_PMR_INVAL ((odp_pmr_t)~0)
-
-#define ODP_COS_NAME_LEN 32
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/odp/arch/default/api/abi/crypto.h b/include/odp/arch/default/api/abi/crypto.h
deleted file mode 100644
index f0793a198..000000000
--- a/include/odp/arch/default/api/abi/crypto.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef ODP_ABI_CRYPTO_H_
-#define ODP_ABI_CRYPTO_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-
-/** @internal Dummy type for strong typing */
-typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_crypto_compl_t;
-
-/** @ingroup odp_crypto
- * @{
- */
-
-#define ODP_CRYPTO_SESSION_INVALID (0xffffffffffffffffULL)
-
-typedef uint64_t odp_crypto_session_t;
-typedef _odp_abi_crypto_compl_t *odp_crypto_compl_t;
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/odp/arch/default/api/abi/event.h b/include/odp/arch/default/api/abi/event.h
deleted file mode 100644
index 4f6596b1b..000000000
--- a/include/odp/arch/default/api/abi/event.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef ODP_ABI_EVENT_H_
-#define ODP_ABI_EVENT_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-
-/** @internal Dummy type for strong typing */
-typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_event_t;
-
-/** @ingroup odp_event
- * @{
- */
-
-typedef _odp_abi_event_t *odp_event_t;
-
-#define ODP_EVENT_INVALID ((odp_event_t)0xffffffff)
-
-typedef enum odp_event_type_t {
- ODP_EVENT_BUFFER = 1,
- ODP_EVENT_PACKET = 2,
- ODP_EVENT_TIMEOUT = 3,
- ODP_EVENT_CRYPTO_COMPL = 4
-} odp_event_type_t;
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/odp/arch/default/api/abi/packet.h b/include/odp/arch/default/api/abi/packet.h
deleted file mode 100644
index 4aac75b9e..000000000
--- a/include/odp/arch/default/api/abi/packet.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef ODP_ABI_PACKET_H_
-#define ODP_ABI_PACKET_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-
-/** @internal Dummy type for strong typing */
-typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_packet_t;
-
-/** @internal Dummy type for strong typing */
-typedef struct { char dummy; /**< *internal Dummy */ } _odp_abi_packet_seg_t;
-
-/** @ingroup odp_packet
- * @{
- */
-
-typedef _odp_abi_packet_t *odp_packet_t;
-typedef _odp_abi_packet_seg_t *odp_packet_seg_t;
-
-#define ODP_PACKET_INVALID ((odp_packet_t)0xffffffff)
-#define ODP_PACKET_SEG_INVALID ((odp_packet_seg_t)0xffffffff)
-#define ODP_PACKET_OFFSET_INVALID (0x0fffffff)
-
-typedef enum {
- ODP_PACKET_GREEN = 0,
- ODP_PACKET_YELLOW = 1,
- ODP_PACKET_RED = 2,
- ODP_PACKET_ALL_COLORS = 3,
-} odp_packet_color_t;
-
-#define ODP_NUM_PACKET_COLORS 3
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/odp/arch/default/api/abi/pool.h b/include/odp/arch/default/api/abi/pool.h
deleted file mode 100644
index 4637d19fe..000000000
--- a/include/odp/arch/default/api/abi/pool.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef ODP_ABI_POOL_H_
-#define ODP_ABI_POOL_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <odp/api/abi/event.h>
-
-/** @internal Dummy type for strong typing */
-typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_pool_t;
-
-/** @ingroup odp_pool
- * @{
- */
-
-typedef _odp_abi_pool_t *odp_pool_t;
-
-#define ODP_POOL_INVALID ((odp_pool_t)0xffffffff)
-
-#define ODP_POOL_NAME_LEN 32
-
-typedef enum odp_pool_type_t {
- ODP_POOL_BUFFER = ODP_EVENT_BUFFER,
- ODP_POOL_PACKET = ODP_EVENT_PACKET,
- ODP_POOL_TIMEOUT = ODP_EVENT_TIMEOUT
-} odp_pool_type_t;
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/odp/arch/default/api/abi/queue.h b/include/odp/arch/default/api/abi/queue.h
deleted file mode 100644
index 378b069ce..000000000
--- a/include/odp/arch/default/api/abi/queue.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef ODP_ABI_QUEUE_H_
-#define ODP_ABI_QUEUE_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @internal Dummy type for strong typing */
-typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_queue_t;
-
-/** @ingroup odp_queue
- * @{
- */
-
-typedef _odp_abi_queue_t *odp_queue_t;
-
-#define ODP_QUEUE_INVALID ((odp_queue_t)0)
-
-#define ODP_QUEUE_NAME_LEN 32
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/odp/arch/default/api/abi/shared_memory.h b/include/odp/arch/default/api/abi/shared_memory.h
deleted file mode 100644
index 5805f957f..000000000
--- a/include/odp/arch/default/api/abi/shared_memory.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef ODP_ABI_SHM_H_
-#define ODP_ABI_SHM_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** @internal Dummy type for strong typing */
-typedef struct { char dummy; /**< @internal Dummy */ } _odp_abi_shm_t;
-
-/** @ingroup odp_shared_memory
- * @{
- */
-
-typedef _odp_abi_shm_t *odp_shm_t;
-
-#define ODP_SHM_INVALID ((odp_shm_t)0)
-#define ODP_SHM_NULL ODP_SHM_INVALID
-#define ODP_SHM_NAME_LEN 32
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/include/odp/arch/mips64-linux/odp/api/abi/buffer.h b/include/odp/arch/mips64-linux/odp/api/abi/buffer.h
deleted file mode 100644
index d9c31930d..000000000
--- a/include/odp/arch/mips64-linux/odp/api/abi/buffer.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <odp/arch/default/api/abi/buffer.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
deleted file mode 100644
index d48a4733f..000000000
--- a/include/odp/arch/mips64-linux/odp/api/abi/classification.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <odp/arch/default/api/abi/classification.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
deleted file mode 100644
index 9a9d2dc1b..000000000
--- a/include/odp/arch/mips64-linux/odp/api/abi/crypto.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <odp/arch/default/api/abi/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
deleted file mode 100644
index 5d2ac75e7..000000000
--- a/include/odp/arch/mips64-linux/odp/api/abi/event.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <odp/arch/default/api/abi/event.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
deleted file mode 100644
index f44cb5365..000000000
--- a/include/odp/arch/mips64-linux/odp/api/abi/packet.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <odp/arch/default/api/abi/packet.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
deleted file mode 100644
index b354afbf7..000000000
--- a/include/odp/arch/mips64-linux/odp/api/abi/pool.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <odp/arch/default/api/abi/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
deleted file mode 100644
index 6027cee2f..000000000
--- a/include/odp/arch/mips64-linux/odp/api/abi/queue.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <odp/arch/default/api/abi/queue.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
deleted file mode 100644
index d20367859..000000000
--- a/include/odp/arch/mips64-linux/odp/api/abi/shared_memory.h
+++ /dev/null
@@ -1,7 +0,0 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <odp/arch/default/api/abi/shared_memory.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/align.h b/include/odp/arch/power64-linux/odp/api/abi/align.h
new file mode 100644
index 000000000..aa8f2eab7
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/align.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/align.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
new file mode 100644
index 000000000..ab7c3f17b
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/atomic.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..c3388fd2a
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/barrier.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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 d9c31930d..2ffa07d1f 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/buffer.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/buffer.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/buffer_types.h b/include/odp/arch/power64-linux/odp/api/abi/buffer_types.h
new file mode 100644
index 000000000..331e123c7
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/buffer_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/buffer_types.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
new file mode 100644
index 000000000..9c9728840
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/byteorder.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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 d48a4733f..789f3a92a 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/classification.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/classification.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/comp.h b/include/odp/arch/power64-linux/odp/api/abi/comp.h
new file mode 100644
index 000000000..7b4be9d3e
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/comp.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/comp.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/cpu.h b/include/odp/arch/power64-linux/odp/api/abi/cpu.h
new file mode 100644
index 000000000..55b59b1ab
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/cpu.h
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ * Copyright (c) 2021 Nokia
+ */
+
+#ifndef ODP_API_ABI_CPU_H_
+#define ODP_API_ABI_CPU_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ODP_CACHE_LINE_SIZE 128
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/include/odp/arch/power64-linux/odp/api/abi/cpumask.h b/include/odp/arch/power64-linux/odp/api/abi/cpumask.h
new file mode 100644
index 000000000..696f8664f
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/cpumask.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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 9a9d2dc1b..9d39ba7bc 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/crypto.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/crypto.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/crypto_types.h b/include/odp/arch/power64-linux/odp/api/abi/crypto_types.h
new file mode 100644
index 000000000..7e1da759a
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/crypto_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/crypto_types.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/debug.h b/include/odp/arch/power64-linux/odp/api/abi/debug.h
new file mode 100644
index 000000000..8a2ef2ade
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/debug.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/debug.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/dma.h b/include/odp/arch/power64-linux/odp/api/abi/dma.h
new file mode 100644
index 000000000..f5e42a076
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/dma.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/dma.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/dma_types.h b/include/odp/arch/power64-linux/odp/api/abi/dma_types.h
new file mode 100644
index 000000000..cd96b9933
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/dma_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/dma_types.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/errno.h b/include/odp/arch/power64-linux/odp/api/abi/errno.h
new file mode 100644
index 000000000..9d197a8d4
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/errno.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2020 Marvell
+ */
+
+#include <odp/api/abi-default/errno.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 5d2ac75e7..6f7074bb1 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/event.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/event.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/event_types.h b/include/odp/arch/power64-linux/odp/api/abi/event_types.h
new file mode 100644
index 000000000..ece9cbef0
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/event_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/event_types.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/hash.h b/include/odp/arch/power64-linux/odp/api/abi/hash.h
new file mode 100644
index 000000000..72431f765
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/hash.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2020 Marvell
+ */
+
+#include <odp/api/abi-default/hash.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
new file mode 100644
index 000000000..936644f46
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/init.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..33c03cbe2
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/ipsec.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/ipsec.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/ipsec_types.h b/include/odp/arch/power64-linux/odp/api/abi/ipsec_types.h
new file mode 100644
index 000000000..854e7aa01
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/ipsec_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/ipsec_types.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/ml_types.h b/include/odp/arch/power64-linux/odp/api/abi/ml_types.h
new file mode 100644
index 000000000..4201f92e6
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/ml_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/ml_types.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 f44cb5365..9d560e6c8 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/packet.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/packet.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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
new file mode 100644
index 000000000..598047d96
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/packet_flags.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..4356eb007
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/packet_io.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/packet_io.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/packet_io_types.h b/include/odp/arch/power64-linux/odp/api/abi/packet_io_types.h
new file mode 100644
index 000000000..3e8962f6a
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/packet_io_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/packet_io_types.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/packet_types.h b/include/odp/arch/power64-linux/odp/api/abi/packet_types.h
new file mode 100644
index 000000000..9af00c158
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/packet_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/packet_types.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 b354afbf7..2f2e9164f 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/pool.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/pool.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/pool_types.h b/include/odp/arch/power64-linux/odp/api/abi/pool_types.h
new file mode 100644
index 000000000..a8366b5d2
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/pool_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/pool_types.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/proto_stats.h b/include/odp/arch/power64-linux/odp/api/abi/proto_stats.h
new file mode 100644
index 000000000..81108faa5
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/proto_stats.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#include <odp/api/abi-default/proto_stats.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/proto_stats_types.h b/include/odp/arch/power64-linux/odp/api/abi/proto_stats_types.h
new file mode 100644
index 000000000..f6884a40a
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/proto_stats_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/proto_stats_types.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 6027cee2f..2ba9174d0 100644
--- a/include/odp/arch/power64-linux/odp/api/abi/queue.h
+++ b/include/odp/arch/power64-linux/odp/api/abi/queue.h
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/queue_types.h b/include/odp/arch/power64-linux/odp/api/abi/queue_types.h
new file mode 100644
index 000000000..f1a8e197d
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/queue_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/queue_types.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/random.h b/include/odp/arch/power64-linux/odp/api/abi/random.h
new file mode 100644
index 000000000..703dcf5a0
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/random.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/random.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
new file mode 100644
index 000000000..5f953d6f6
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/rwlock.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..f10116aeb
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/rwlock_recursive.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..cd16a1161
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/schedule.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..1b2990c2b
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/schedule_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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 d20367859..7ba8a2248 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
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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
new file mode 100644
index 000000000..c626baae5
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/spinlock.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..6794590ca
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/spinlock_recursive.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/spinlock_recursive.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/stash.h b/include/odp/arch/power64-linux/odp/api/abi/stash.h
new file mode 100644
index 000000000..ed2cbbc64
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/stash.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2020 Nokia
+ */
+
+#include <odp/api/abi-default/stash.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/stash_types.h b/include/odp/arch/power64-linux/odp/api/abi/stash_types.h
new file mode 100644
index 000000000..0f2759726
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/stash_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/stash_types.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/std.h b/include/odp/arch/power64-linux/odp/api/abi/std.h
new file mode 100644
index 000000000..936009922
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/std.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/std.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
new file mode 100644
index 000000000..c0d930e1f
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/std_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..dbe3a95ab
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/sync.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..b6a233c96
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/thread.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/thread.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/thread_types.h b/include/odp/arch/power64-linux/odp/api/abi/thread_types.h
new file mode 100644
index 000000000..e695c233b
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/thread_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/thread_types.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
new file mode 100644
index 000000000..2bb61d233
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/thrmask.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..4317157b8
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/ticketlock.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..0f2425669
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/time.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/time.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/time_types.h b/include/odp/arch/power64-linux/odp/api/abi/time_types.h
new file mode 100644
index 000000000..a415200a0
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/time_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/time_types.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
new file mode 100644
index 000000000..0d7965bf7
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/timer.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/timer.h>
diff --git a/include/odp/arch/power64-linux/odp/api/abi/timer_types.h b/include/odp/arch/power64-linux/odp/api/abi/timer_types.h
new file mode 100644
index 000000000..51b578aa7
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/timer_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/timer_types.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
new file mode 100644
index 000000000..9a457c370
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/traffic_mngr.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..cf4b9a128
--- /dev/null
+++ b/include/odp/arch/power64-linux/odp/api/abi/version.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/version.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/align.h b/include/odp/arch/x86_32-linux/odp/api/abi/align.h
new file mode 100644
index 000000000..aa8f2eab7
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/align.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/align.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
new file mode 100644
index 000000000..ab7c3f17b
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/atomic.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..c3388fd2a
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/barrier.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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 d9c31930d..2ffa07d1f 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
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/buffer_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/buffer_types.h
new file mode 100644
index 000000000..331e123c7
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/buffer_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/buffer_types.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
new file mode 100644
index 000000000..9c9728840
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/byteorder.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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 d48a4733f..789f3a92a 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
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/comp.h b/include/odp/arch/x86_32-linux/odp/api/abi/comp.h
new file mode 100644
index 000000000..7b4be9d3e
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/comp.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/comp.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h b/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h
new file mode 100644
index 000000000..575f4a5ec
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/cpu.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2016-2018 Linaro Limited
+ */
+
+#ifndef ODP_API_ABI_CPU_H_
+#define ODP_API_ABI_CPU_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ODP_CACHE_LINE_SIZE 64
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
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
new file mode 100644
index 000000000..696f8664f
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/cpumask.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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 9a9d2dc1b..9d39ba7bc 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
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/crypto_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/crypto_types.h
new file mode 100644
index 000000000..7e1da759a
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/crypto_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/crypto_types.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/debug.h b/include/odp/arch/x86_32-linux/odp/api/abi/debug.h
new file mode 100644
index 000000000..8a2ef2ade
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/debug.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/debug.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/dma.h b/include/odp/arch/x86_32-linux/odp/api/abi/dma.h
new file mode 100644
index 000000000..f5e42a076
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/dma.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/dma.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/dma_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/dma_types.h
new file mode 100644
index 000000000..cd96b9933
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/dma_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/dma_types.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/errno.h b/include/odp/arch/x86_32-linux/odp/api/abi/errno.h
new file mode 100644
index 000000000..9d197a8d4
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/errno.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2020 Marvell
+ */
+
+#include <odp/api/abi-default/errno.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 5d2ac75e7..6f7074bb1 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
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/event_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/event_types.h
new file mode 100644
index 000000000..ece9cbef0
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/event_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/event_types.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/hash.h b/include/odp/arch/x86_32-linux/odp/api/abi/hash.h
new file mode 100644
index 000000000..72431f765
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/hash.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2020 Marvell
+ */
+
+#include <odp/api/abi-default/hash.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
new file mode 100644
index 000000000..936644f46
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/init.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..33c03cbe2
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/ipsec.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/ipsec.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/ipsec_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/ipsec_types.h
new file mode 100644
index 000000000..854e7aa01
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/ipsec_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/ipsec_types.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/ml_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/ml_types.h
new file mode 100644
index 000000000..4201f92e6
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/ml_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/ml_types.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 f44cb5365..9d560e6c8 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
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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
new file mode 100644
index 000000000..598047d96
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/packet_flags.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..4356eb007
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/packet_io.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/packet_io.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/packet_io_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/packet_io_types.h
new file mode 100644
index 000000000..3e8962f6a
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/packet_io_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/packet_io_types.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/packet_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/packet_types.h
new file mode 100644
index 000000000..9af00c158
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/packet_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/packet_types.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 b354afbf7..2f2e9164f 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
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/pool_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/pool_types.h
new file mode 100644
index 000000000..a8366b5d2
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/pool_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/pool_types.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/proto_stats.h b/include/odp/arch/x86_32-linux/odp/api/abi/proto_stats.h
new file mode 100644
index 000000000..81108faa5
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/proto_stats.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#include <odp/api/abi-default/proto_stats.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/proto_stats_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/proto_stats_types.h
new file mode 100644
index 000000000..f6884a40a
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/proto_stats_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/proto_stats_types.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 6027cee2f..2ba9174d0 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
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/queue_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/queue_types.h
new file mode 100644
index 000000000..f1a8e197d
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/queue_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/queue_types.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/random.h b/include/odp/arch/x86_32-linux/odp/api/abi/random.h
new file mode 100644
index 000000000..703dcf5a0
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/random.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/random.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
new file mode 100644
index 000000000..5f953d6f6
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/rwlock.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..f10116aeb
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/rwlock_recursive.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..cd16a1161
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/schedule.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..1b2990c2b
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/schedule_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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 d20367859..7ba8a2248 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
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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
new file mode 100644
index 000000000..c626baae5
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/spinlock.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..6794590ca
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/spinlock_recursive.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/spinlock_recursive.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/stash.h b/include/odp/arch/x86_32-linux/odp/api/abi/stash.h
new file mode 100644
index 000000000..ed2cbbc64
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/stash.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2020 Nokia
+ */
+
+#include <odp/api/abi-default/stash.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/stash_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/stash_types.h
new file mode 100644
index 000000000..0f2759726
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/stash_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/stash_types.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/std.h b/include/odp/arch/x86_32-linux/odp/api/abi/std.h
new file mode 100644
index 000000000..936009922
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/std.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/std.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
new file mode 100644
index 000000000..c0d930e1f
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/std_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..dbe3a95ab
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/sync.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..b6a233c96
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/thread.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/thread.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/thread_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/thread_types.h
new file mode 100644
index 000000000..e695c233b
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/thread_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/thread_types.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
new file mode 100644
index 000000000..2bb61d233
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/thrmask.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..4317157b8
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/ticketlock.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..0f2425669
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/time.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/time.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/time_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/time_types.h
new file mode 100644
index 000000000..a415200a0
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/time_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/time_types.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
new file mode 100644
index 000000000..0d7965bf7
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/timer.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/timer.h>
diff --git a/include/odp/arch/x86_32-linux/odp/api/abi/timer_types.h b/include/odp/arch/x86_32-linux/odp/api/abi/timer_types.h
new file mode 100644
index 000000000..51b578aa7
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/timer_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/timer_types.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
new file mode 100644
index 000000000..9a457c370
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/traffic_mngr.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..cf4b9a128
--- /dev/null
+++ b/include/odp/arch/x86_32-linux/odp/api/abi/version.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/version.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/align.h b/include/odp/arch/x86_64-linux/odp/api/abi/align.h
new file mode 100644
index 000000000..aa8f2eab7
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/align.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/align.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
new file mode 100644
index 000000000..ab7c3f17b
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/atomic.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..c3388fd2a
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/barrier.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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 d9c31930d..2ffa07d1f 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
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/buffer_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/buffer_types.h
new file mode 100644
index 000000000..331e123c7
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/buffer_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/buffer_types.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
new file mode 100644
index 000000000..9c9728840
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/byteorder.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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 d48a4733f..789f3a92a 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
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/comp.h b/include/odp/arch/x86_64-linux/odp/api/abi/comp.h
new file mode 100644
index 000000000..7b4be9d3e
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/comp.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/comp.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h b/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h
new file mode 100644
index 000000000..575f4a5ec
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/cpu.h
@@ -0,0 +1,18 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2016-2018 Linaro Limited
+ */
+
+#ifndef ODP_API_ABI_CPU_H_
+#define ODP_API_ABI_CPU_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define ODP_CACHE_LINE_SIZE 64
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
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
new file mode 100644
index 000000000..696f8664f
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/cpumask.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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 9a9d2dc1b..9d39ba7bc 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
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/crypto_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/crypto_types.h
new file mode 100644
index 000000000..7e1da759a
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/crypto_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/crypto_types.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/debug.h b/include/odp/arch/x86_64-linux/odp/api/abi/debug.h
new file mode 100644
index 000000000..8a2ef2ade
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/debug.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/debug.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/dma.h b/include/odp/arch/x86_64-linux/odp/api/abi/dma.h
new file mode 100644
index 000000000..f5e42a076
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/dma.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/dma.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/dma_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/dma_types.h
new file mode 100644
index 000000000..cd96b9933
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/dma_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/dma_types.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/errno.h b/include/odp/arch/x86_64-linux/odp/api/abi/errno.h
new file mode 100644
index 000000000..9d197a8d4
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/errno.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2020 Marvell
+ */
+
+#include <odp/api/abi-default/errno.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 5d2ac75e7..6f7074bb1 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
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/event_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/event_types.h
new file mode 100644
index 000000000..ece9cbef0
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/event_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/event_types.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/hash.h b/include/odp/arch/x86_64-linux/odp/api/abi/hash.h
new file mode 100644
index 000000000..72431f765
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/hash.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2020 Marvell
+ */
+
+#include <odp/api/abi-default/hash.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
new file mode 100644
index 000000000..936644f46
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/init.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..33c03cbe2
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/ipsec.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/ipsec.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/ipsec_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/ipsec_types.h
new file mode 100644
index 000000000..854e7aa01
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/ipsec_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/ipsec_types.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/ml_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/ml_types.h
new file mode 100644
index 000000000..4201f92e6
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/ml_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/ml_types.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 f44cb5365..9d560e6c8 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
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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
new file mode 100644
index 000000000..598047d96
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/packet_flags.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..4356eb007
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/packet_io.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/packet_io.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/packet_io_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/packet_io_types.h
new file mode 100644
index 000000000..3e8962f6a
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/packet_io_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/packet_io_types.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/packet_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/packet_types.h
new file mode 100644
index 000000000..9af00c158
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/packet_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/packet_types.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 b354afbf7..2f2e9164f 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
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/pool_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/pool_types.h
new file mode 100644
index 000000000..a8366b5d2
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/pool_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/pool_types.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/proto_stats.h b/include/odp/arch/x86_64-linux/odp/api/abi/proto_stats.h
new file mode 100644
index 000000000..81108faa5
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/proto_stats.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2021 Marvell.
+ */
+
+#include <odp/api/abi-default/proto_stats.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/proto_stats_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/proto_stats_types.h
new file mode 100644
index 000000000..f6884a40a
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/proto_stats_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/proto_stats_types.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 6027cee2f..2ba9174d0 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
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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/queue_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/queue_types.h
new file mode 100644
index 000000000..f1a8e197d
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/queue_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2021 Nokia
+ */
+
+#include <odp/api/abi-default/queue_types.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/random.h b/include/odp/arch/x86_64-linux/odp/api/abi/random.h
new file mode 100644
index 000000000..703dcf5a0
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/random.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/random.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
new file mode 100644
index 000000000..5f953d6f6
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/rwlock.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..f10116aeb
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/rwlock_recursive.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..cd16a1161
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/schedule.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..1b2990c2b
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/schedule_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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 d20367859..7ba8a2248 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
@@ -1,7 +1,5 @@
-/* Copyright (c) 2017, Linaro Limited
- * All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
*/
-#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
new file mode 100644
index 000000000..c626baae5
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/spinlock.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..6794590ca
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/spinlock_recursive.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/spinlock_recursive.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/stash.h b/include/odp/arch/x86_64-linux/odp/api/abi/stash.h
new file mode 100644
index 000000000..ed2cbbc64
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/stash.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2020 Nokia
+ */
+
+#include <odp/api/abi-default/stash.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/stash_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/stash_types.h
new file mode 100644
index 000000000..0f2759726
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/stash_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/stash_types.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/std.h b/include/odp/arch/x86_64-linux/odp/api/abi/std.h
new file mode 100644
index 000000000..936009922
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/std.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/std.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
new file mode 100644
index 000000000..c0d930e1f
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/std_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..dbe3a95ab
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/sync.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..b6a233c96
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/thread.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/thread.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/thread_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/thread_types.h
new file mode 100644
index 000000000..e695c233b
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/thread_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/thread_types.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
new file mode 100644
index 000000000..2bb61d233
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/thrmask.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..4317157b8
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/ticketlock.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..0f2425669
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/time.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/time.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/time_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/time_types.h
new file mode 100644
index 000000000..a415200a0
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/time_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Nokia
+ */
+
+#include <odp/api/abi-default/time_types.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
new file mode 100644
index 000000000..0d7965bf7
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/timer.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2022 Nokia
+ */
+
+#include <odp/api/abi-default/timer.h>
diff --git a/include/odp/arch/x86_64-linux/odp/api/abi/timer_types.h b/include/odp/arch/x86_64-linux/odp/api/abi/timer_types.h
new file mode 100644
index 000000000..51b578aa7
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/timer_types.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/timer_types.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
new file mode 100644
index 000000000..9a457c370
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#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
new file mode 100644
index 000000000..cf4b9a128
--- /dev/null
+++ b/include/odp/arch/x86_64-linux/odp/api/abi/version.h
@@ -0,0 +1,5 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2017-2018 Linaro Limited
+ */
+
+#include <odp/api/abi-default/version.h>