api and linux-generic: make room for new api

This is about making the current structure clearer so that other
interfaces can be added to ODP:
The ODP API specification (platform agnostic) is moved from
include/odp/api to include/odp/api/spec.
The ODP API platform definition (for linux generic) is moved from
platform/linux-generic/include/odp to
platform/linux-generic/include/odp/api
Include statements are adjusted accordinaly.
This patch has been done by a script which is given with the cover-letter
of this patch series.

Signed-off-by: Christophe Milard <christophe.milard@linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

166 files changed, 517 insertions, 517 deletions

diff --git a/include/odp.h b/include/odp.h
index 2adcb8b74..57569bfe2 100644
--- a/include/odp.h
+++ b/include/odp.h
@@ -18,46 +18,46 @@
 extern "C" {
 #endif
 
-#include <odp/config.h>
+#include <odp/api/config.h>
 
-#include <odp/version.h>
-#include <odp/std_types.h>
-#include <odp/compiler.h>
-#include <odp/align.h>
-#include <odp/hash.h>
-#include <odp/hints.h>
-#include <odp/debug.h>
-#include <odp/byteorder.h>
-#include <odp/cpu.h>
-#include <odp/cpumask.h>
-#include <odp/barrier.h>
-#include <odp/spinlock.h>
-#include <odp/atomic.h>
-#include <odp/init.h>
-#include <odp/system_info.h>
-#include <odp/thread.h>
-#include <odp/shared_memory.h>
-#include <odp/buffer.h>
-#include <odp/pool.h>
-#include <odp/queue.h>
-#include <odp/ticketlock.h>
-#include <odp/time.h>
-#include <odp/timer.h>
-#include <odp/schedule.h>
-#include <odp/sync.h>
-#include <odp/packet.h>
-#include <odp/packet_flags.h>
-#include <odp/packet_io.h>
-#include <odp/crypto.h>
-#include <odp/classification.h>
-#include <odp/rwlock.h>
-#include <odp/event.h>
-#include <odp/random.h>
-#include <odp/errno.h>
-#include <odp/thrmask.h>
-#include <odp/spinlock_recursive.h>
-#include <odp/rwlock_recursive.h>
-#include <odp/std_clib.h>
+#include <odp/api/version.h>
+#include <odp/api/std_types.h>
+#include <odp/api/compiler.h>
+#include <odp/api/align.h>
+#include <odp/api/hash.h>
+#include <odp/api/hints.h>
+#include <odp/api/debug.h>
+#include <odp/api/byteorder.h>
+#include <odp/api/cpu.h>
+#include <odp/api/cpumask.h>
+#include <odp/api/barrier.h>
+#include <odp/api/spinlock.h>
+#include <odp/api/atomic.h>
+#include <odp/api/init.h>
+#include <odp/api/system_info.h>
+#include <odp/api/thread.h>
+#include <odp/api/shared_memory.h>
+#include <odp/api/buffer.h>
+#include <odp/api/pool.h>
+#include <odp/api/queue.h>
+#include <odp/api/ticketlock.h>
+#include <odp/api/time.h>
+#include <odp/api/timer.h>
+#include <odp/api/schedule.h>
+#include <odp/api/sync.h>
+#include <odp/api/packet.h>
+#include <odp/api/packet_flags.h>
+#include <odp/api/packet_io.h>
+#include <odp/api/crypto.h>
+#include <odp/api/classification.h>
+#include <odp/api/rwlock.h>
+#include <odp/api/event.h>
+#include <odp/api/random.h>
+#include <odp/api/errno.h>
+#include <odp/api/thrmask.h>
+#include <odp/api/spinlock_recursive.h>
+#include <odp/api/rwlock_recursive.h>
+#include <odp/api/std_clib.h>
 
 #ifdef __cplusplus
 }
diff --git a/include/odp/api/align.h b/include/odp/api/spec/align.h
index 677ff12ce..677ff12ce 100644
--- a/include/odp/api/align.h
+++ b/include/odp/api/spec/align.h
diff --git a/include/odp/api/atomic.h b/include/odp/api/spec/atomic.h
index a16d90bfb..a16d90bfb 100644
--- a/include/odp/api/atomic.h
+++ b/include/odp/api/spec/atomic.h
diff --git a/include/odp/api/barrier.h b/include/odp/api/spec/barrier.h
index 823eae66c..823eae66c 100644
--- a/include/odp/api/barrier.h
+++ b/include/odp/api/spec/barrier.h
diff --git a/include/odp/api/buffer.h b/include/odp/api/spec/buffer.h
index 6631f478c..6631f478c 100644
--- a/include/odp/api/buffer.h
+++ b/include/odp/api/spec/buffer.h
diff --git a/include/odp/api/byteorder.h b/include/odp/api/spec/byteorder.h
index a12a7296f..a12a7296f 100644
--- a/include/odp/api/byteorder.h
+++ b/include/odp/api/spec/byteorder.h
diff --git a/include/odp/api/classification.h b/include/odp/api/spec/classification.h
index 076b3defe..076b3defe 100644
--- a/include/odp/api/classification.h
+++ b/include/odp/api/spec/classification.h
diff --git a/include/odp/api/compiler.h b/include/odp/api/spec/compiler.h
index 5a24bfb2a..5a24bfb2a 100644
--- a/include/odp/api/compiler.h
+++ b/include/odp/api/spec/compiler.h
diff --git a/include/odp/api/config.h b/include/odp/api/spec/config.h
index c9879d6d8..c9879d6d8 100644
--- a/include/odp/api/config.h
+++ b/include/odp/api/spec/config.h
diff --git a/include/odp/api/cpu.h b/include/odp/api/spec/cpu.h
index eaee24b5c..f0e20c458 100644
--- a/include/odp/api/cpu.h
+++ b/include/odp/api/spec/cpu.h
@@ -18,7 +18,7 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
+#include <odp/api/std_types.h>
 
 /** @defgroup odp_cpu ODP CPU
  *  @{
diff --git a/include/odp/api/cpumask.h b/include/odp/api/spec/cpumask.h
index 4407b1025..42098c2e4 100644
--- a/include/odp/api/cpumask.h
+++ b/include/odp/api/spec/cpumask.h
@@ -18,7 +18,7 @@
 extern "C" {
 #endif
 
-#include <odp/config.h>
+#include <odp/api/config.h>
 
 /** @defgroup odp_cpumask ODP CPUMASK
  *  CPU mask operations.
diff --git a/include/odp/api/crypto.h b/include/odp/api/spec/crypto.h
index 41beedbf5..41beedbf5 100644
--- a/include/odp/api/crypto.h
+++ b/include/odp/api/spec/crypto.h
diff --git a/include/odp/api/debug.h b/include/odp/api/spec/debug.h
index 252a82f55..252a82f55 100644
--- a/include/odp/api/debug.h
+++ b/include/odp/api/spec/debug.h
diff --git a/include/odp/api/errno.h b/include/odp/api/spec/errno.h
index 33998b61b..33998b61b 100644
--- a/include/odp/api/errno.h
+++ b/include/odp/api/spec/errno.h
diff --git a/include/odp/api/event.h b/include/odp/api/spec/event.h
index 29547f335..29547f335 100644
--- a/include/odp/api/event.h
+++ b/include/odp/api/spec/event.h
diff --git a/include/odp/api/hash.h b/include/odp/api/spec/hash.h
index 1b2a580ea..a6bc75310 100644
--- a/include/odp/api/hash.h
+++ b/include/odp/api/spec/hash.h
@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
+#include <odp/api/std_types.h>
 
 /** @defgroup odp_hash ODP HASH FUNCTIONS
  *  ODP Hash functions
diff --git a/include/odp/api/hints.h b/include/odp/api/spec/hints.h
index ea67fc401..ea67fc401 100644
--- a/include/odp/api/hints.h
+++ b/include/odp/api/spec/hints.h
diff --git a/include/odp/api/init.h b/include/odp/api/spec/init.h
index 381f77e79..2c98109da 100644
--- a/include/odp/api/init.h
+++ b/include/odp/api/spec/init.h
@@ -28,9 +28,9 @@ extern "C" {
 
 
 
-#include <odp/std_types.h>
-#include <odp/hints.h>
-#include <odp/thread.h>
+#include <odp/api/std_types.h>
+#include <odp/api/hints.h>
+#include <odp/api/thread.h>
 
 /** @defgroup odp_initialization ODP INITIALIZATION
  *  Initialisation operations.
diff --git a/include/odp/api/packet.h b/include/odp/api/spec/packet.h
index 85cc9c995..85cc9c995 100644
--- a/include/odp/api/packet.h
+++ b/include/odp/api/spec/packet.h
diff --git a/include/odp/api/packet_flags.h b/include/odp/api/spec/packet_flags.h
index 7c3b247a9..a0d56cbdc 100644
--- a/include/odp/api/packet_flags.h
+++ b/include/odp/api/spec/packet_flags.h
@@ -18,8 +18,8 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
-#include <odp/packet.h>
+#include <odp/api/std_types.h>
+#include <odp/api/packet.h>
 
 /** @addtogroup odp_packet
  *  Boolean operations on a packet.
diff --git a/include/odp/api/packet_io.h b/include/odp/api/spec/packet_io.h
index 42796da2f..b63bd3f51 100644
--- a/include/odp/api/packet_io.h
+++ b/include/odp/api/spec/packet_io.h
@@ -18,8 +18,8 @@
 extern "C" {
 #endif
 
-#include <odp/api/packet_io_stats.h>
-#include <odp/api/queue.h>
+#include <odp/api/spec/packet_io_stats.h>
+#include <odp/api/spec/queue.h>
 
 /** @defgroup odp_packet_io ODP PACKET IO
  *  Operations on a packet Input/Output interface.
diff --git a/include/odp/api/packet_io_stats.h b/include/odp/api/spec/packet_io_stats.h
index 148ad8d40..148ad8d40 100644
--- a/include/odp/api/packet_io_stats.h
+++ b/include/odp/api/spec/packet_io_stats.h
diff --git a/include/odp/api/pool.h b/include/odp/api/spec/pool.h
index deab9633a..94a302e73 100644
--- a/include/odp/api/pool.h
+++ b/include/odp/api/spec/pool.h
@@ -20,7 +20,7 @@ extern "C" {
 
 
 
-#include <odp/std_types.h>
+#include <odp/api/std_types.h>
 
 /** @defgroup odp_pool ODP POOL
  *  Operations on a pool.
diff --git a/include/odp/api/queue.h b/include/odp/api/spec/queue.h
index bde8ca3f6..532d6b650 100644
--- a/include/odp/api/queue.h
+++ b/include/odp/api/spec/queue.h
@@ -18,8 +18,8 @@
 extern "C" {
 #endif
 
-#include <odp/schedule_types.h>
-#include <odp/event.h>
+#include <odp/api/schedule_types.h>
+#include <odp/api/event.h>
 
 /** @defgroup odp_queue ODP QUEUE
  *  Macros and operation on a queue.
diff --git a/include/odp/api/random.h b/include/odp/api/spec/random.h
index 3451b0d1d..3451b0d1d 100644
--- a/include/odp/api/random.h
+++ b/include/odp/api/spec/random.h
diff --git a/include/odp/api/rwlock.h b/include/odp/api/spec/rwlock.h
index 54f426fe7..54f426fe7 100644
--- a/include/odp/api/rwlock.h
+++ b/include/odp/api/spec/rwlock.h
diff --git a/include/odp/api/rwlock_recursive.h b/include/odp/api/spec/rwlock_recursive.h
index 10b2f79ba..10b2f79ba 100644
--- a/include/odp/api/rwlock_recursive.h
+++ b/include/odp/api/spec/rwlock_recursive.h
diff --git a/include/odp/api/schedule.h b/include/odp/api/spec/schedule.h
index 68ba594fd..4ae681d7f 100644
--- a/include/odp/api/schedule.h
+++ b/include/odp/api/spec/schedule.h
@@ -19,11 +19,11 @@ extern "C" {
 #endif
 
 
-#include <odp/std_types.h>
-#include <odp/event.h>
-#include <odp/queue.h>
-#include <odp/schedule_types.h>
-#include <odp/thrmask.h>
+#include <odp/api/std_types.h>
+#include <odp/api/event.h>
+#include <odp/api/queue.h>
+#include <odp/api/schedule_types.h>
+#include <odp/api/thrmask.h>
 
 /** @defgroup odp_scheduler ODP SCHEDULER
  *  Operations on the scheduler.
diff --git a/include/odp/api/schedule_types.h b/include/odp/api/spec/schedule_types.h
index cf204f46d..cf204f46d 100644
--- a/include/odp/api/schedule_types.h
+++ b/include/odp/api/spec/schedule_types.h
diff --git a/include/odp/api/shared_memory.h b/include/odp/api/spec/shared_memory.h
index 5d851ce12..5d851ce12 100644
--- a/include/odp/api/shared_memory.h
+++ b/include/odp/api/spec/shared_memory.h
diff --git a/include/odp/api/spinlock.h b/include/odp/api/spec/spinlock.h
index 154d0258a..154d0258a 100644
--- a/include/odp/api/spinlock.h
+++ b/include/odp/api/spec/spinlock.h
diff --git a/include/odp/api/spinlock_recursive.h b/include/odp/api/spec/spinlock_recursive.h
index d98f2bbb6..d98f2bbb6 100644
--- a/include/odp/api/spinlock_recursive.h
+++ b/include/odp/api/spec/spinlock_recursive.h
diff --git a/include/odp/api/std_clib.h b/include/odp/api/spec/std_clib.h
index 791b72f1c..791b72f1c 100644
--- a/include/odp/api/std_clib.h
+++ b/include/odp/api/spec/std_clib.h
diff --git a/include/odp/api/std_types.h b/include/odp/api/spec/std_types.h
index 7558c647d..7558c647d 100644
--- a/include/odp/api/std_types.h
+++ b/include/odp/api/spec/std_types.h
diff --git a/include/odp/api/sync.h b/include/odp/api/spec/sync.h
index c6f790c6f..c6f790c6f 100644
--- a/include/odp/api/sync.h
+++ b/include/odp/api/spec/sync.h
diff --git a/include/odp/api/system_info.h b/include/odp/api/spec/system_info.h
index bde3a6031..bde3a6031 100644
--- a/include/odp/api/system_info.h
+++ b/include/odp/api/spec/system_info.h
diff --git a/include/odp/api/thread.h b/include/odp/api/spec/thread.h
index 37202497a..37202497a 100644
--- a/include/odp/api/thread.h
+++ b/include/odp/api/spec/thread.h
diff --git a/include/odp/api/thrmask.h b/include/odp/api/spec/thrmask.h
index af0d9bae4..a22da8c42 100644
--- a/include/odp/api/thrmask.h
+++ b/include/odp/api/spec/thrmask.h
@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
+#include <odp/api/std_types.h>
 
 /** @addtogroup odp_thread
  *  Thread mask operations.
diff --git a/include/odp/api/ticketlock.h b/include/odp/api/spec/ticketlock.h
index 3f0e3f556..3f0e3f556 100644
--- a/include/odp/api/ticketlock.h
+++ b/include/odp/api/spec/ticketlock.h
diff --git a/include/odp/api/time.h b/include/odp/api/spec/time.h
index 85692ec11..85692ec11 100644
--- a/include/odp/api/time.h
+++ b/include/odp/api/spec/time.h
diff --git a/include/odp/api/timer.h b/include/odp/api/spec/timer.h
index 435c0045f..435c0045f 100644
--- a/include/odp/api/timer.h
+++ b/include/odp/api/spec/timer.h
diff --git a/include/odp/api/version.h b/include/odp/api/spec/version.h
index 15c8dbdb3..15c8dbdb3 100644
--- a/include/odp/api/version.h
+++ b/include/odp/api/spec/version.h
diff --git a/platform/Makefile.inc b/platform/Makefile.inc
index 147ba9f4e..7d6405696 100644
--- a/platform/Makefile.inc
+++ b/platform/Makefile.inc
@@ -19,46 +19,46 @@ AM_CFLAGS += -DPLATFORM=${with_platform}
 #The implementation will need to retain the deprecated implementation
 AM_CFLAGS += -Wno-deprecated-declarations
 
-odpapiincludedir= $(includedir)/odp/api
-odpapiinclude_HEADERS = \
-		  $(top_srcdir)/include/odp/api/align.h \
-		  $(top_srcdir)/include/odp/api/atomic.h \
-		  $(top_srcdir)/include/odp/api/barrier.h \
-		  $(top_srcdir)/include/odp/api/buffer.h \
-		  $(top_srcdir)/include/odp/api/byteorder.h \
-		  $(top_srcdir)/include/odp/api/classification.h \
-		  $(top_srcdir)/include/odp/api/compiler.h \
-		  $(top_srcdir)/include/odp/api/config.h \
-		  $(top_srcdir)/include/odp/api/cpu.h \
-		  $(top_srcdir)/include/odp/api/cpumask.h \
-		  $(top_srcdir)/include/odp/api/crypto.h \
-		  $(top_srcdir)/include/odp/api/debug.h \
-		  $(top_srcdir)/include/odp/api/errno.h \
-		  $(top_srcdir)/include/odp/api/event.h \
-		  $(top_srcdir)/include/odp/api/hash.h \
-		  $(top_srcdir)/include/odp/api/hints.h \
-		  $(top_srcdir)/include/odp/api/init.h \
-		  $(top_srcdir)/include/odp/api/packet.h \
-		  $(top_srcdir)/include/odp/api/packet_flags.h \
-		  $(top_srcdir)/include/odp/api/packet_io.h \
-		  $(top_srcdir)/include/odp/api/packet_io_stats.h \
-		  $(top_srcdir)/include/odp/api/pool.h \
-		  $(top_srcdir)/include/odp/api/queue.h \
-		  $(top_srcdir)/include/odp/api/random.h \
-		  $(top_srcdir)/include/odp/api/rwlock.h \
-		  $(top_srcdir)/include/odp/api/rwlock_recursive.h \
-		  $(top_srcdir)/include/odp/api/schedule.h \
-		  $(top_srcdir)/include/odp/api/schedule_types.h \
-		  $(top_srcdir)/include/odp/api/shared_memory.h \
-		  $(top_srcdir)/include/odp/api/spinlock.h \
-		  $(top_srcdir)/include/odp/api/spinlock_recursive.h \
-		  $(top_srcdir)/include/odp/api/std_clib.h \
-		  $(top_srcdir)/include/odp/api/std_types.h \
-		  $(top_srcdir)/include/odp/api/sync.h \
-		  $(top_srcdir)/include/odp/api/system_info.h \
-		  $(top_srcdir)/include/odp/api/thread.h \
-		  $(top_srcdir)/include/odp/api/thrmask.h \
-		  $(top_srcdir)/include/odp/api/ticketlock.h \
-		  $(top_srcdir)/include/odp/api/time.h \
-		  $(top_srcdir)/include/odp/api/timer.h \
-		  $(top_srcdir)/include/odp/api/version.h
+odpapispecincludedir= $(includedir)/odp/api/spec
+odpapispecinclude_HEADERS = \
+		  $(top_srcdir)/include/odp/api/spec/align.h \
+		  $(top_srcdir)/include/odp/api/spec/atomic.h \
+		  $(top_srcdir)/include/odp/api/spec/barrier.h \
+		  $(top_srcdir)/include/odp/api/spec/buffer.h \
+		  $(top_srcdir)/include/odp/api/spec/byteorder.h \
+		  $(top_srcdir)/include/odp/api/spec/classification.h \
+		  $(top_srcdir)/include/odp/api/spec/compiler.h \
+		  $(top_srcdir)/include/odp/api/spec/config.h \
+		  $(top_srcdir)/include/odp/api/spec/cpu.h \
+		  $(top_srcdir)/include/odp/api/spec/cpumask.h \
+		  $(top_srcdir)/include/odp/api/spec/crypto.h \
+		  $(top_srcdir)/include/odp/api/spec/debug.h \
+		  $(top_srcdir)/include/odp/api/spec/errno.h \
+		  $(top_srcdir)/include/odp/api/spec/event.h \
+		  $(top_srcdir)/include/odp/api/spec/hash.h \
+		  $(top_srcdir)/include/odp/api/spec/hints.h \
+		  $(top_srcdir)/include/odp/api/spec/init.h \
+		  $(top_srcdir)/include/odp/api/spec/packet.h \
+		  $(top_srcdir)/include/odp/api/spec/packet_flags.h \
+		  $(top_srcdir)/include/odp/api/spec/packet_io.h \
+		  $(top_srcdir)/include/odp/api/spec/packet_io_stats.h \
+		  $(top_srcdir)/include/odp/api/spec/pool.h \
+		  $(top_srcdir)/include/odp/api/spec/queue.h \
+		  $(top_srcdir)/include/odp/api/spec/random.h \
+		  $(top_srcdir)/include/odp/api/spec/rwlock.h \
+		  $(top_srcdir)/include/odp/api/spec/rwlock_recursive.h \
+		  $(top_srcdir)/include/odp/api/spec/schedule.h \
+		  $(top_srcdir)/include/odp/api/spec/schedule_types.h \
+		  $(top_srcdir)/include/odp/api/spec/shared_memory.h \
+		  $(top_srcdir)/include/odp/api/spec/spinlock.h \
+		  $(top_srcdir)/include/odp/api/spec/spinlock_recursive.h \
+		  $(top_srcdir)/include/odp/api/spec/std_clib.h \
+		  $(top_srcdir)/include/odp/api/spec/std_types.h \
+		  $(top_srcdir)/include/odp/api/spec/sync.h \
+		  $(top_srcdir)/include/odp/api/spec/system_info.h \
+		  $(top_srcdir)/include/odp/api/spec/thread.h \
+		  $(top_srcdir)/include/odp/api/spec/thrmask.h \
+		  $(top_srcdir)/include/odp/api/spec/ticketlock.h \
+		  $(top_srcdir)/include/odp/api/spec/time.h \
+		  $(top_srcdir)/include/odp/api/spec/timer.h \
+		  $(top_srcdir)/include/odp/api/spec/version.h
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index a9090a371..7ee0e1228 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -11,78 +11,78 @@ AM_CFLAGS +=  -I$(top_srcdir)/helper/include
 include_HEADERS = \
 		  $(top_srcdir)/include/odp.h
 
-odpincludedir= $(includedir)/odp
-odpinclude_HEADERS = \
-		  $(srcdir)/include/odp/align.h \
-		  $(srcdir)/include/odp/atomic.h \
-		  $(srcdir)/include/odp/barrier.h \
-		  $(srcdir)/include/odp/buffer.h \
-		  $(srcdir)/include/odp/byteorder.h \
-		  $(srcdir)/include/odp/classification.h \
-		  $(srcdir)/include/odp/compiler.h \
-		  $(srcdir)/include/odp/config.h \
-		  $(srcdir)/include/odp/cpu.h \
-		  $(srcdir)/include/odp/cpumask.h \
-		  $(srcdir)/include/odp/crypto.h \
-		  $(srcdir)/include/odp/debug.h \
-		  $(srcdir)/include/odp/errno.h \
-		  $(srcdir)/include/odp/event.h \
-		  $(srcdir)/include/odp/hash.h \
-		  $(srcdir)/include/odp/hints.h \
-		  $(srcdir)/include/odp/init.h \
-		  $(srcdir)/include/odp/packet_flags.h \
-		  $(srcdir)/include/odp/packet.h \
-		  $(srcdir)/include/odp/packet_io.h \
-		  $(srcdir)/include/odp/pool.h \
-		  $(srcdir)/include/odp/queue.h \
-		  $(srcdir)/include/odp/random.h \
-		  $(srcdir)/include/odp/rwlock.h \
-		  $(srcdir)/include/odp/rwlock_recursive.h \
-		  $(srcdir)/include/odp/schedule.h \
-		  $(srcdir)/include/odp/schedule_types.h \
-		  $(srcdir)/include/odp/shared_memory.h \
-		  $(srcdir)/include/odp/spinlock.h \
-		  $(srcdir)/include/odp/spinlock_recursive.h \
-		  $(srcdir)/include/odp/std_clib.h \
-		  $(srcdir)/include/odp/std_types.h \
-		  $(srcdir)/include/odp/sync.h \
-		  $(srcdir)/include/odp/system_info.h \
-		  $(srcdir)/include/odp/thread.h \
-		  $(srcdir)/include/odp/thrmask.h \
-		  $(srcdir)/include/odp/ticketlock.h \
-		  $(srcdir)/include/odp/time.h \
-		  $(srcdir)/include/odp/timer.h \
-		  $(srcdir)/include/odp/version.h \
+odpapiincludedir= $(includedir)/odp/api
+odpapiinclude_HEADERS = \
+		  $(srcdir)/include/odp/api/align.h \
+		  $(srcdir)/include/odp/api/atomic.h \
+		  $(srcdir)/include/odp/api/barrier.h \
+		  $(srcdir)/include/odp/api/buffer.h \
+		  $(srcdir)/include/odp/api/byteorder.h \
+		  $(srcdir)/include/odp/api/classification.h \
+		  $(srcdir)/include/odp/api/compiler.h \
+		  $(srcdir)/include/odp/api/config.h \
+		  $(srcdir)/include/odp/api/cpu.h \
+		  $(srcdir)/include/odp/api/cpumask.h \
+		  $(srcdir)/include/odp/api/crypto.h \
+		  $(srcdir)/include/odp/api/debug.h \
+		  $(srcdir)/include/odp/api/errno.h \
+		  $(srcdir)/include/odp/api/event.h \
+		  $(srcdir)/include/odp/api/hash.h \
+		  $(srcdir)/include/odp/api/hints.h \
+		  $(srcdir)/include/odp/api/init.h \
+		  $(srcdir)/include/odp/api/packet_flags.h \
+		  $(srcdir)/include/odp/api/packet.h \
+		  $(srcdir)/include/odp/api/packet_io.h \
+		  $(srcdir)/include/odp/api/pool.h \
+		  $(srcdir)/include/odp/api/queue.h \
+		  $(srcdir)/include/odp/api/random.h \
+		  $(srcdir)/include/odp/api/rwlock.h \
+		  $(srcdir)/include/odp/api/rwlock_recursive.h \
+		  $(srcdir)/include/odp/api/schedule.h \
+		  $(srcdir)/include/odp/api/schedule_types.h \
+		  $(srcdir)/include/odp/api/shared_memory.h \
+		  $(srcdir)/include/odp/api/spinlock.h \
+		  $(srcdir)/include/odp/api/spinlock_recursive.h \
+		  $(srcdir)/include/odp/api/std_clib.h \
+		  $(srcdir)/include/odp/api/std_types.h \
+		  $(srcdir)/include/odp/api/sync.h \
+		  $(srcdir)/include/odp/api/system_info.h \
+		  $(srcdir)/include/odp/api/thread.h \
+		  $(srcdir)/include/odp/api/thrmask.h \
+		  $(srcdir)/include/odp/api/ticketlock.h \
+		  $(srcdir)/include/odp/api/time.h \
+		  $(srcdir)/include/odp/api/timer.h \
+		  $(srcdir)/include/odp/api/version.h \
 		  $(srcdir)/arch/@ARCH@/odp/cpu_arch.h
 
-odpplatincludedir= $(includedir)/odp/plat
-odpplatinclude_HEADERS = \
-		  $(srcdir)/include/odp/plat/atomic_types.h \
-		  $(srcdir)/include/odp/plat/barrier_types.h \
-		  $(srcdir)/include/odp/plat/buffer_types.h \
-		  $(srcdir)/include/odp/plat/byteorder_types.h \
-		  $(srcdir)/include/odp/plat/classification_types.h \
-		  $(srcdir)/include/odp/plat/cpumask_types.h \
-		  $(srcdir)/include/odp/plat/crypto_types.h \
-		  $(srcdir)/include/odp/plat/event_types.h \
-		  $(srcdir)/include/odp/plat/init_types.h \
-		  $(srcdir)/include/odp/plat/packet_types.h \
-		  $(srcdir)/include/odp/plat/packet_io_types.h \
-		  $(srcdir)/include/odp/plat/pool_types.h \
-		  $(srcdir)/include/odp/plat/queue_types.h \
-		  $(srcdir)/include/odp/plat/rwlock_types.h \
-		  $(srcdir)/include/odp/plat/rwlock_recursive_types.h \
-		  $(srcdir)/include/odp/plat/schedule_types.h \
-		  $(srcdir)/include/odp/plat/shared_memory_types.h \
-		  $(srcdir)/include/odp/plat/spinlock_types.h \
-		  $(srcdir)/include/odp/plat/spinlock_recursive_types.h \
-		  $(srcdir)/include/odp/plat/strong_types.h \
-		  $(srcdir)/include/odp/plat/thread_types.h \
-		  $(srcdir)/include/odp/plat/thrmask_types.h \
-		  $(srcdir)/include/odp/plat/ticketlock_types.h \
-		  $(srcdir)/include/odp/plat/time_types.h \
-		  $(srcdir)/include/odp/plat/timer_types.h \
-		  $(srcdir)/include/odp/plat/version_types.h
+odpapiplatincludedir= $(includedir)/odp/api/plat
+odpapiplatinclude_HEADERS = \
+		  $(srcdir)/include/odp/api/plat/atomic_types.h \
+		  $(srcdir)/include/odp/api/plat/barrier_types.h \
+		  $(srcdir)/include/odp/api/plat/buffer_types.h \
+		  $(srcdir)/include/odp/api/plat/byteorder_types.h \
+		  $(srcdir)/include/odp/api/plat/classification_types.h \
+		  $(srcdir)/include/odp/api/plat/cpumask_types.h \
+		  $(srcdir)/include/odp/api/plat/crypto_types.h \
+		  $(srcdir)/include/odp/api/plat/event_types.h \
+		  $(srcdir)/include/odp/api/plat/init_types.h \
+		  $(srcdir)/include/odp/api/plat/packet_types.h \
+		  $(srcdir)/include/odp/api/plat/packet_io_types.h \
+		  $(srcdir)/include/odp/api/plat/pool_types.h \
+		  $(srcdir)/include/odp/api/plat/queue_types.h \
+		  $(srcdir)/include/odp/api/plat/rwlock_types.h \
+		  $(srcdir)/include/odp/api/plat/rwlock_recursive_types.h \
+		  $(srcdir)/include/odp/api/plat/schedule_types.h \
+		  $(srcdir)/include/odp/api/plat/shared_memory_types.h \
+		  $(srcdir)/include/odp/api/plat/spinlock_types.h \
+		  $(srcdir)/include/odp/api/plat/spinlock_recursive_types.h \
+		  $(srcdir)/include/odp/api/plat/strong_types.h \
+		  $(srcdir)/include/odp/api/plat/thread_types.h \
+		  $(srcdir)/include/odp/api/plat/thrmask_types.h \
+		  $(srcdir)/include/odp/api/plat/ticketlock_types.h \
+		  $(srcdir)/include/odp/api/plat/time_types.h \
+		  $(srcdir)/include/odp/api/plat/timer_types.h \
+		  $(srcdir)/include/odp/api/plat/version_types.h
 
 noinst_HEADERS = \
 		  ${srcdir}/include/odp_align_internal.h \
diff --git a/platform/linux-generic/arch/linux/odp_cpu_arch.c b/platform/linux-generic/arch/linux/odp_cpu_arch.c
index 3112d0cd0..2ac223e07 100644
--- a/platform/linux-generic/arch/linux/odp_cpu_arch.c
+++ b/platform/linux-generic/arch/linux/odp_cpu_arch.c
@@ -9,9 +9,9 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include <odp/cpu.h>
-#include <odp/hints.h>
-#include <odp/system_info.h>
+#include <odp/api/cpu.h>
+#include <odp/api/hints.h>
+#include <odp/api/system_info.h>
 #include <odp_debug_internal.h>
 
 #define GIGA 1000000000
diff --git a/platform/linux-generic/arch/mips64/odp_cpu_arch.c b/platform/linux-generic/arch/mips64/odp_cpu_arch.c
index a20a31325..646acf9c1 100644
--- a/platform/linux-generic/arch/mips64/odp_cpu_arch.c
+++ b/platform/linux-generic/arch/mips64/odp_cpu_arch.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/cpu.h>
-#include <odp/hints.h>
-#include <odp/system_info.h>
+#include <odp/api/cpu.h>
+#include <odp/api/hints.h>
+#include <odp/api/system_info.h>
 
 uint64_t odp_cpu_cycles(void)
 {
diff --git a/platform/linux-generic/arch/x86/odp_cpu_arch.c b/platform/linux-generic/arch/x86/odp_cpu_arch.c
index 1c5c0ec7f..c8cf27b65 100644
--- a/platform/linux-generic/arch/x86/odp_cpu_arch.c
+++ b/platform/linux-generic/arch/x86/odp_cpu_arch.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include <odp/cpu.h>
+#include <odp/api/cpu.h>
 
 uint64_t odp_cpu_cycles(void)
 {
diff --git a/platform/linux-generic/include/odp/align.h b/platform/linux-generic/include/odp/api/align.h
index be8c9ae07..2f2d1e42e 100644
--- a/platform/linux-generic/include/odp/align.h
+++ b/platform/linux-generic/include/odp/api/align.h
@@ -65,7 +65,7 @@ extern "C" {
  * @}
  */
 
-#include <odp/api/align.h>
+#include <odp/api/spec/align.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/atomic.h b/platform/linux-generic/include/odp/api/atomic.h
index e262f4851..b48738358 100644
--- a/platform/linux-generic/include/odp/atomic.h
+++ b/platform/linux-generic/include/odp/api/atomic.h
@@ -17,8 +17,8 @@
 extern "C" {
 #endif
 
-#include <odp/align.h>
-#include <odp/plat/atomic_types.h>
+#include <odp/api/align.h>
+#include <odp/api/plat/atomic_types.h>
 
 /** @ingroup odp_atomic
  *  @{
@@ -411,7 +411,7 @@ static inline int odp_atomic_cas_acq_rel_u64(odp_atomic_u64_t *atom,
  * @}
  */
 
-#include <odp/api/atomic.h>
+#include <odp/api/spec/atomic.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/barrier.h b/platform/linux-generic/include/odp/api/barrier.h
index 3447429f0..ab1b77562 100644
--- a/platform/linux-generic/include/odp/barrier.h
+++ b/platform/linux-generic/include/odp/api/barrier.h
@@ -17,12 +17,12 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
-#include <odp/atomic.h>
-#include <odp/plat/shared_memory_types.h>
-#include <odp/plat/barrier_types.h>
+#include <odp/api/std_types.h>
+#include <odp/api/atomic.h>
+#include <odp/api/plat/shared_memory_types.h>
+#include <odp/api/plat/barrier_types.h>
 
-#include <odp/api/barrier.h>
+#include <odp/api/spec/barrier.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/buffer.h b/platform/linux-generic/include/odp/api/buffer.h
index ae80e0c5c..81dbf1280 100644
--- a/platform/linux-generic/include/odp/buffer.h
+++ b/platform/linux-generic/include/odp/api/buffer.h
@@ -17,10 +17,10 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
-#include <odp/plat/event_types.h>
-#include <odp/plat/buffer_types.h>
-#include <odp/plat/pool_types.h>
+#include <odp/api/std_types.h>
+#include <odp/api/plat/event_types.h>
+#include <odp/api/plat/buffer_types.h>
+#include <odp/api/plat/pool_types.h>
 
 /** @ingroup odp_buffer
  *  @{
@@ -30,7 +30,7 @@ extern "C" {
  * @}
  */
 
-#include <odp/api/buffer.h>
+#include <odp/api/spec/buffer.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/byteorder.h b/platform/linux-generic/include/odp/api/byteorder.h
index 6c94556b0..c347be071 100644
--- a/platform/linux-generic/include/odp/byteorder.h
+++ b/platform/linux-generic/include/odp/api/byteorder.h
@@ -17,9 +17,9 @@
 extern "C" {
 #endif
 
-#include <odp/plat/byteorder_types.h>
-#include <odp/std_types.h>
-#include <odp/compiler.h>
+#include <odp/api/plat/byteorder_types.h>
+#include <odp/api/std_types.h>
+#include <odp/api/compiler.h>
 
 /** @ingroup odp_compiler_optim
  *  @{
@@ -140,7 +140,7 @@ static inline odp_u64le_t odp_cpu_to_le_64(uint64_t cpu64)
  * @}
  */
 
-#include <odp/api/byteorder.h>
+#include <odp/api/spec/byteorder.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/classification.h b/platform/linux-generic/include/odp/api/classification.h
index 5f122666d..0bec38be8 100644
--- a/platform/linux-generic/include/odp/classification.h
+++ b/platform/linux-generic/include/odp/api/classification.h
@@ -17,12 +17,12 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
-#include <odp/plat/pool_types.h>
-#include <odp/plat/classification_types.h>
-#include <odp/plat/packet_types.h>
-#include <odp/plat/packet_io_types.h>
-#include <odp/plat/queue_types.h>
+#include <odp/api/std_types.h>
+#include <odp/api/plat/pool_types.h>
+#include <odp/api/plat/classification_types.h>
+#include <odp/api/plat/packet_types.h>
+#include <odp/api/plat/packet_io_types.h>
+#include <odp/api/plat/queue_types.h>
 
 /** @ingroup odp_classification
  *  @{
@@ -32,7 +32,7 @@ extern "C" {
  * @}
  */
 
-#include <odp/api/classification.h>
+#include <odp/api/spec/classification.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/compiler.h b/platform/linux-generic/include/odp/api/compiler.h
index 8f15961dc..5249d5d62 100644
--- a/platform/linux-generic/include/odp/compiler.h
+++ b/platform/linux-generic/include/odp/api/compiler.h
@@ -25,7 +25,7 @@ extern "C" {
  * @}
  */
 
-#include <odp/api/compiler.h>
+#include <odp/api/spec/compiler.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/config.h b/platform/linux-generic/include/odp/api/config.h
index da8856ff0..e21b6f71c 100644
--- a/platform/linux-generic/include/odp/config.h
+++ b/platform/linux-generic/include/odp/api/config.h
@@ -187,7 +187,7 @@ static inline int odp_config_shm_blocks(void)
 	return ODP_CONFIG_SHM_BLOCKS;
 }
 
-#include <odp/api/config.h>
+#include <odp/api/spec/config.h>
 
 /**
  * @}
diff --git a/platform/linux-generic/include/odp/cpu.h b/platform/linux-generic/include/odp/api/cpu.h
index b98507dd5..e0bdc9eec 100644
--- a/platform/linux-generic/include/odp/cpu.h
+++ b/platform/linux-generic/include/odp/api/cpu.h
@@ -19,7 +19,7 @@ extern "C" {
 
 #include <odp/cpu_arch.h>
 
-#include <odp/api/cpu.h>
+#include <odp/api/spec/cpu.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/cpumask.h b/platform/linux-generic/include/odp/api/cpumask.h
index cf7ad9d6a..15bf25e8a 100644
--- a/platform/linux-generic/include/odp/cpumask.h
+++ b/platform/linux-generic/include/odp/api/cpumask.h
@@ -20,10 +20,10 @@ extern "C" {
 #include <string.h>
 #include <sched.h>
 
-#include <odp/std_types.h>
-#include <odp/plat/cpumask_types.h>
+#include <odp/api/std_types.h>
+#include <odp/api/plat/cpumask_types.h>
 
-#include <odp/api/cpumask.h>
+#include <odp/api/spec/cpumask.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/crypto.h b/platform/linux-generic/include/odp/api/crypto.h
index 7684c1e8c..4f65932aa 100644
--- a/platform/linux-generic/include/odp/crypto.h
+++ b/platform/linux-generic/include/odp/api/crypto.h
@@ -17,12 +17,12 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
-#include <odp/plat/packet_types.h>
-#include <odp/plat/crypto_types.h>
-#include <odp/plat/buffer_types.h>
-#include <odp/plat/pool_types.h>
-#include <odp/queue.h>
+#include <odp/api/std_types.h>
+#include <odp/api/plat/packet_types.h>
+#include <odp/api/plat/crypto_types.h>
+#include <odp/api/plat/buffer_types.h>
+#include <odp/api/plat/pool_types.h>
+#include <odp/api/queue.h>
 
 /** @ingroup odp_crypto
  *  @{
@@ -32,7 +32,7 @@ extern "C" {
  * @}
  */
 
-#include <odp/api/crypto.h>
+#include <odp/api/spec/crypto.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/debug.h b/platform/linux-generic/include/odp/api/debug.h
index a2e59bf7d..dc1fce08d 100644
--- a/platform/linux-generic/include/odp/debug.h
+++ b/platform/linux-generic/include/odp/api/debug.h
@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-#include <odp/api/debug.h>
+#include <odp/api/spec/debug.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/errno.h b/platform/linux-generic/include/odp/api/errno.h
index e53b49cf8..f70d84df0 100644
--- a/platform/linux-generic/include/odp/errno.h
+++ b/platform/linux-generic/include/odp/api/errno.h
@@ -18,7 +18,7 @@ extern "C" {
 #endif
 
 
-#include <odp/api/errno.h>
+#include <odp/api/spec/errno.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/event.h b/platform/linux-generic/include/odp/api/event.h
index 753d0235f..55931b625 100644
--- a/platform/linux-generic/include/odp/event.h
+++ b/platform/linux-generic/include/odp/api/event.h
@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-#include <odp/plat/event_types.h>
+#include <odp/api/plat/event_types.h>
 
 /** @ingroup odp_event
  *  @{
@@ -27,7 +27,7 @@ extern "C" {
  * @}
  */
 
-#include <odp/api/event.h>
+#include <odp/api/spec/event.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/hash.h b/platform/linux-generic/include/odp/api/hash.h
index df8add002..332029ed0 100644
--- a/platform/linux-generic/include/odp/hash.h
+++ b/platform/linux-generic/include/odp/api/hash.h
@@ -25,7 +25,7 @@ extern "C" {
  * @}
  */
 
-#include <odp/api/hash.h>
+#include <odp/api/spec/hash.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/hints.h b/platform/linux-generic/include/odp/api/hints.h
index 002cfa8d0..3ba1ba95e 100644
--- a/platform/linux-generic/include/odp/hints.h
+++ b/platform/linux-generic/include/odp/api/hints.h
@@ -25,7 +25,7 @@ extern "C" {
  * @}
  */
 
-#include <odp/api/hints.h>
+#include <odp/api/spec/hints.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/init.h b/platform/linux-generic/include/odp/api/init.h
index 3233e36de..1d9f59a6f 100644
--- a/platform/linux-generic/include/odp/init.h
+++ b/platform/linux-generic/include/odp/api/init.h
@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-#include <odp/plat/init_types.h>
+#include <odp/api/plat/init_types.h>
 
 /** @ingroup odp_initialization
  *  @{
@@ -27,7 +27,7 @@ extern "C" {
  * @}
  */
 
-#include <odp/api/init.h>
+#include <odp/api/spec/init.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/packet.h b/platform/linux-generic/include/odp/api/packet.h
index a59988b36..ebbeaf1b9 100644
--- a/platform/linux-generic/include/odp/packet.h
+++ b/platform/linux-generic/include/odp/api/packet.h
@@ -17,12 +17,12 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
-#include <odp/plat/event_types.h>
-#include <odp/plat/packet_io_types.h>
-#include <odp/plat/packet_types.h>
-#include <odp/plat/buffer_types.h>
-#include <odp/plat/pool_types.h>
+#include <odp/api/std_types.h>
+#include <odp/api/plat/event_types.h>
+#include <odp/api/plat/packet_io_types.h>
+#include <odp/api/plat/packet_types.h>
+#include <odp/api/plat/buffer_types.h>
+#include <odp/api/plat/pool_types.h>
 
 /** @ingroup odp_packet
  *  @{
@@ -32,7 +32,7 @@ extern "C" {
  * @}
  */
 
-#include <odp/api/packet.h>
+#include <odp/api/spec/packet.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/packet_flags.h b/platform/linux-generic/include/odp/api/packet_flags.h
index 5b9c3ca2d..467f5b1d7 100644
--- a/platform/linux-generic/include/odp/packet_flags.h
+++ b/platform/linux-generic/include/odp/api/packet_flags.h
@@ -25,7 +25,7 @@ extern "C" {
  * @}
  */
 
-#include <odp/api/packet_flags.h>
+#include <odp/api/spec/packet_flags.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/packet_io.h b/platform/linux-generic/include/odp/api/packet_io.h
index 1d690f577..76c7dfeda 100644
--- a/platform/linux-generic/include/odp/packet_io.h
+++ b/platform/linux-generic/include/odp/api/packet_io.h
@@ -17,12 +17,12 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
-#include <odp/plat/pool_types.h>
-#include <odp/plat/classification_types.h>
-#include <odp/plat/packet_types.h>
-#include <odp/plat/packet_io_types.h>
-#include <odp/plat/queue_types.h>
+#include <odp/api/std_types.h>
+#include <odp/api/plat/pool_types.h>
+#include <odp/api/plat/classification_types.h>
+#include <odp/api/plat/packet_types.h>
+#include <odp/api/plat/packet_io_types.h>
+#include <odp/api/plat/queue_types.h>
 
 /** @ingroup odp_packet_io
  *  @{
@@ -32,7 +32,7 @@ extern "C" {
  * @}
  */
 
-#include <odp/api/packet_io.h>
+#include <odp/api/spec/packet_io.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/plat/atomic_types.h b/platform/linux-generic/include/odp/api/plat/atomic_types.h
index bc0bd8bfe..3bb2bbddb 100644
--- a/platform/linux-generic/include/odp/plat/atomic_types.h
+++ b/platform/linux-generic/include/odp/api/plat/atomic_types.h
@@ -18,8 +18,8 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
-#include <odp/align.h>
+#include <odp/api/std_types.h>
+#include <odp/api/align.h>
 
 /**
  * @internal
diff --git a/platform/linux-generic/include/odp/plat/barrier_types.h b/platform/linux-generic/include/odp/api/plat/barrier_types.h
index b8e1d97bb..440275e79 100644
--- a/platform/linux-generic/include/odp/plat/barrier_types.h
+++ b/platform/linux-generic/include/odp/api/plat/barrier_types.h
@@ -18,8 +18,8 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
-#include <odp/atomic.h>
+#include <odp/api/std_types.h>
+#include <odp/api/atomic.h>
 
 /**
  * @internal
diff --git a/platform/linux-generic/include/odp/plat/buffer_types.h b/platform/linux-generic/include/odp/api/plat/buffer_types.h
index 32030206b..344121b61 100644
--- a/platform/linux-generic/include/odp/plat/buffer_types.h
+++ b/platform/linux-generic/include/odp/api/plat/buffer_types.h
@@ -17,8 +17,8 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
-#include <odp/plat/strong_types.h>
+#include <odp/api/std_types.h>
+#include <odp/api/plat/strong_types.h>
 
 /** ODP buffer */
 typedef ODP_HANDLE_T(odp_buffer_t);
diff --git a/platform/linux-generic/include/odp/plat/byteorder_types.h b/platform/linux-generic/include/odp/api/plat/byteorder_types.h
index 0a8e4096e..0a8e4096e 100644
--- a/platform/linux-generic/include/odp/plat/byteorder_types.h
+++ b/platform/linux-generic/include/odp/api/plat/byteorder_types.h
diff --git a/platform/linux-generic/include/odp/plat/classification_types.h b/platform/linux-generic/include/odp/api/plat/classification_types.h
index d9b9c774b..2093f54ac 100644
--- a/platform/linux-generic/include/odp/plat/classification_types.h
+++ b/platform/linux-generic/include/odp/api/plat/classification_types.h
@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-#include <odp/plat/strong_types.h>
+#include <odp/api/plat/strong_types.h>
 
 /** @addtogroup odp_classification
  *  @{
diff --git a/platform/linux-generic/include/odp/plat/cpumask_types.h b/platform/linux-generic/include/odp/api/plat/cpumask_types.h
index 8923f3622..c59f407a0 100644
--- a/platform/linux-generic/include/odp/plat/cpumask_types.h
+++ b/platform/linux-generic/include/odp/api/plat/cpumask_types.h
@@ -22,7 +22,7 @@ extern "C" {
  *  @{
  */
 
-#include <odp/std_types.h>
+#include <odp/api/std_types.h>
 
 #define ODP_CPUMASK_SIZE 1024
 
diff --git a/platform/linux-generic/include/odp/plat/crypto_types.h b/platform/linux-generic/include/odp/api/plat/crypto_types.h
index 0cbbce8bd..0cbbce8bd 100644
--- a/platform/linux-generic/include/odp/plat/crypto_types.h
+++ b/platform/linux-generic/include/odp/api/plat/crypto_types.h
diff --git a/platform/linux-generic/include/odp/plat/event_types.h b/platform/linux-generic/include/odp/api/plat/event_types.h
index 06b15cdfe..9ca0fb80f 100644
--- a/platform/linux-generic/include/odp/plat/event_types.h
+++ b/platform/linux-generic/include/odp/api/plat/event_types.h
@@ -18,8 +18,8 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
-#include <odp/plat/strong_types.h>
+#include <odp/api/std_types.h>
+#include <odp/api/plat/strong_types.h>
 
 /** @defgroup odp_event ODP EVENT
  *  Operations on an event.
diff --git a/platform/linux-generic/include/odp/plat/init_types.h b/platform/linux-generic/include/odp/api/plat/init_types.h
index b240c93ca..b240c93ca 100644
--- a/platform/linux-generic/include/odp/plat/init_types.h
+++ b/platform/linux-generic/include/odp/api/plat/init_types.h
diff --git a/platform/linux-generic/include/odp/plat/packet_io_types.h b/platform/linux-generic/include/odp/api/plat/packet_io_types.h
index 934d7de97..cd43083ee 100644
--- a/platform/linux-generic/include/odp/plat/packet_io_types.h
+++ b/platform/linux-generic/include/odp/api/plat/packet_io_types.h
@@ -18,8 +18,8 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
-#include <odp/plat/strong_types.h>
+#include <odp/api/std_types.h>
+#include <odp/api/plat/strong_types.h>
 
 /** @addtogroup odp_packet_io
  *  Operations on a packet.
diff --git a/platform/linux-generic/include/odp/plat/packet_types.h b/platform/linux-generic/include/odp/api/plat/packet_types.h
index 45cb8010d..5d1690faf 100644
--- a/platform/linux-generic/include/odp/plat/packet_types.h
+++ b/platform/linux-generic/include/odp/api/plat/packet_types.h
@@ -18,8 +18,8 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
-#include <odp/plat/strong_types.h>
+#include <odp/api/std_types.h>
+#include <odp/api/plat/strong_types.h>
 
 /** @addtogroup odp_packet ODP PACKET
  *  Operations on a packet.
diff --git a/platform/linux-generic/include/odp/plat/pool_types.h b/platform/linux-generic/include/odp/api/plat/pool_types.h
index 4b32c29ea..1ca8f02ed 100644
--- a/platform/linux-generic/include/odp/plat/pool_types.h
+++ b/platform/linux-generic/include/odp/api/plat/pool_types.h
@@ -13,9 +13,9 @@
 #ifndef ODP_POOL_TYPES_H_
 #define ODP_POOL_TYPES_H_
 
-#include <odp/std_types.h>
-#include <odp/plat/strong_types.h>
-#include <odp/plat/event_types.h>
+#include <odp/api/std_types.h>
+#include <odp/api/plat/strong_types.h>
+#include <odp/api/plat/event_types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/platform/linux-generic/include/odp/plat/queue_types.h b/platform/linux-generic/include/odp/api/plat/queue_types.h
index 40a53e5e6..82b95bd89 100644
--- a/platform/linux-generic/include/odp/plat/queue_types.h
+++ b/platform/linux-generic/include/odp/api/plat/queue_types.h
@@ -17,8 +17,8 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
-#include <odp/plat/strong_types.h>
+#include <odp/api/std_types.h>
+#include <odp/api/plat/strong_types.h>
 
 /** @addtogroup odp_queue ODP QUEUE
  *  Macros and operation on a queue.
diff --git a/platform/linux-generic/include/odp/plat/rwlock_recursive_types.h b/platform/linux-generic/include/odp/api/plat/rwlock_recursive_types.h
index 474751cf0..36f9204ac 100644
--- a/platform/linux-generic/include/odp/plat/rwlock_recursive_types.h
+++ b/platform/linux-generic/include/odp/api/plat/rwlock_recursive_types.h
@@ -17,9 +17,9 @@
 extern "C" {
 #endif
 
-#include <odp/rwlock.h>
-#include <odp/std_types.h>
-#include <odp/thread.h>
+#include <odp/api/rwlock.h>
+#include <odp/api/std_types.h>
+#include <odp/api/thread.h>
 
 /** @internal */
 struct odp_rwlock_recursive_s {
diff --git a/platform/linux-generic/include/odp/plat/rwlock_types.h b/platform/linux-generic/include/odp/api/plat/rwlock_types.h
index 35d65decb..f7dc04496 100644
--- a/platform/linux-generic/include/odp/plat/rwlock_types.h
+++ b/platform/linux-generic/include/odp/api/plat/rwlock_types.h
@@ -18,7 +18,7 @@
 extern "C" {
 #endif
 
-#include <odp/atomic.h>
+#include <odp/api/atomic.h>
 
 /** @internal */
 struct odp_rwlock_s {
diff --git a/platform/linux-generic/include/odp/plat/schedule_types.h b/platform/linux-generic/include/odp/api/plat/schedule_types.h
index a4a352c04..a4a352c04 100644
--- a/platform/linux-generic/include/odp/plat/schedule_types.h
+++ b/platform/linux-generic/include/odp/api/plat/schedule_types.h
diff --git a/platform/linux-generic/include/odp/plat/shared_memory_types.h b/platform/linux-generic/include/odp/api/plat/shared_memory_types.h
index 4be7356dd..4d8bbccb8 100644
--- a/platform/linux-generic/include/odp/plat/shared_memory_types.h
+++ b/platform/linux-generic/include/odp/api/plat/shared_memory_types.h
@@ -18,8 +18,8 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
-#include <odp/plat/strong_types.h>
+#include <odp/api/std_types.h>
+#include <odp/api/plat/strong_types.h>
 
 /** @addtogroup odp_shared_memory ODP SHARED MEMORY
  *  Operations on shared memory.
diff --git a/platform/linux-generic/include/odp/plat/spinlock_recursive_types.h b/platform/linux-generic/include/odp/api/plat/spinlock_recursive_types.h
index 2809277bd..c5a1adff9 100644
--- a/platform/linux-generic/include/odp/plat/spinlock_recursive_types.h
+++ b/platform/linux-generic/include/odp/api/plat/spinlock_recursive_types.h
@@ -17,8 +17,8 @@
 extern "C" {
 #endif
 
-#include <odp/spinlock.h>
-#include <odp/std_types.h>
+#include <odp/api/spinlock.h>
+#include <odp/api/std_types.h>
 
 /** @internal */
 struct odp_spinlock_recursive_s {
diff --git a/platform/linux-generic/include/odp/plat/spinlock_types.h b/platform/linux-generic/include/odp/api/plat/spinlock_types.h
index 3e0231d1d..f38ece6af 100644
--- a/platform/linux-generic/include/odp/plat/spinlock_types.h
+++ b/platform/linux-generic/include/odp/api/plat/spinlock_types.h
@@ -18,7 +18,7 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
+#include <odp/api/std_types.h>
 
 /** @internal */
 struct odp_spinlock_s {
diff --git a/platform/linux-generic/include/odp/plat/strong_types.h b/platform/linux-generic/include/odp/api/plat/strong_types.h
index a53d76352..a53d76352 100644
--- a/platform/linux-generic/include/odp/plat/strong_types.h
+++ b/platform/linux-generic/include/odp/api/plat/strong_types.h
diff --git a/platform/linux-generic/include/odp/plat/thread_types.h b/platform/linux-generic/include/odp/api/plat/thread_types.h
index 33af45983..33af45983 100644
--- a/platform/linux-generic/include/odp/plat/thread_types.h
+++ b/platform/linux-generic/include/odp/api/plat/thread_types.h
diff --git a/platform/linux-generic/include/odp/plat/thrmask_types.h b/platform/linux-generic/include/odp/api/plat/thrmask_types.h
index 8b3c2fbcf..5d93890c1 100644
--- a/platform/linux-generic/include/odp/plat/thrmask_types.h
+++ b/platform/linux-generic/include/odp/api/plat/thrmask_types.h
@@ -21,7 +21,7 @@ extern "C" {
  *  @{
  */
 
-#include <odp/cpumask.h>
+#include <odp/api/cpumask.h>
 
 /**
  * Minimum size of output buffer for odp_thrmask_to_str()
diff --git a/platform/linux-generic/include/odp/plat/ticketlock_types.h b/platform/linux-generic/include/odp/api/plat/ticketlock_types.h
index 73f970542..81d479d61 100644
--- a/platform/linux-generic/include/odp/plat/ticketlock_types.h
+++ b/platform/linux-generic/include/odp/api/plat/ticketlock_types.h
@@ -18,7 +18,7 @@
 extern "C" {
 #endif
 
-#include <odp/atomic.h>
+#include <odp/api/atomic.h>
 
 /** @internal */
 struct odp_ticketlock_s {
diff --git a/platform/linux-generic/include/odp/plat/time_types.h b/platform/linux-generic/include/odp/api/plat/time_types.h
index 1b9409b2a..1b9409b2a 100644
--- a/platform/linux-generic/include/odp/plat/time_types.h
+++ b/platform/linux-generic/include/odp/api/plat/time_types.h
diff --git a/platform/linux-generic/include/odp/plat/timer_types.h b/platform/linux-generic/include/odp/api/plat/timer_types.h
index 006683e90..006683e90 100644
--- a/platform/linux-generic/include/odp/plat/timer_types.h
+++ b/platform/linux-generic/include/odp/api/plat/timer_types.h
diff --git a/platform/linux-generic/include/odp/plat/version_types.h b/platform/linux-generic/include/odp/api/plat/version_types.h
index e3327eb33..e3327eb33 100644
--- a/platform/linux-generic/include/odp/plat/version_types.h
+++ b/platform/linux-generic/include/odp/api/plat/version_types.h
diff --git a/platform/linux-generic/include/odp/pool.h b/platform/linux-generic/include/odp/api/pool.h
index 02bc3b719..d712b6501 100644
--- a/platform/linux-generic/include/odp/pool.h
+++ b/platform/linux-generic/include/odp/api/pool.h
@@ -25,10 +25,10 @@ extern "C" {
  * @}
  */
 
-#include <odp/plat/pool_types.h>
-#include <odp/plat/shared_memory_types.h>
-#include <odp/plat/event_types.h>
-#include <odp/api/pool.h>
+#include <odp/api/plat/pool_types.h>
+#include <odp/api/plat/shared_memory_types.h>
+#include <odp/api/plat/event_types.h>
+#include <odp/api/spec/pool.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/queue.h b/platform/linux-generic/include/odp/api/queue.h
index 3aa2150e9..a5cf87347 100644
--- a/platform/linux-generic/include/odp/queue.h
+++ b/platform/linux-generic/include/odp/api/queue.h
@@ -17,11 +17,11 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
-#include <odp/plat/event_types.h>
-#include <odp/plat/queue_types.h>
-#include <odp/plat/buffer_types.h>
-#include <odp/plat/pool_types.h>
+#include <odp/api/std_types.h>
+#include <odp/api/plat/event_types.h>
+#include <odp/api/plat/queue_types.h>
+#include <odp/api/plat/buffer_types.h>
+#include <odp/api/plat/pool_types.h>
 
 /** @ingroup odp_queue
  *  @{
@@ -31,7 +31,7 @@ extern "C" {
  * @}
  */
 
-#include <odp/api/queue.h>
+#include <odp/api/spec/queue.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/random.h b/platform/linux-generic/include/odp/api/random.h
index e9b4bd0c7..c8529b3f9 100644
--- a/platform/linux-generic/include/odp/random.h
+++ b/platform/linux-generic/include/odp/api/random.h
@@ -25,7 +25,7 @@ extern "C" {
  * @}
  */
 
-#include <odp/api/random.h>
+#include <odp/api/spec/random.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/rwlock.h b/platform/linux-generic/include/odp/api/rwlock.h
index f9d8f5fd4..4a86173f5 100644
--- a/platform/linux-generic/include/odp/rwlock.h
+++ b/platform/linux-generic/include/odp/api/rwlock.h
@@ -17,9 +17,9 @@
 extern "C" {
 #endif
 
-#include <odp/plat/rwlock_types.h>
+#include <odp/api/plat/rwlock_types.h>
 
-#include <odp/api/rwlock.h>
+#include <odp/api/spec/rwlock.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/rwlock_recursive.h b/platform/linux-generic/include/odp/api/rwlock_recursive.h
index e9dadc878..4a081532d 100644
--- a/platform/linux-generic/include/odp/rwlock_recursive.h
+++ b/platform/linux-generic/include/odp/api/rwlock_recursive.h
@@ -17,9 +17,9 @@
 extern "C" {
 #endif
 
-#include <odp/plat/rwlock_recursive_types.h>
+#include <odp/api/plat/rwlock_recursive_types.h>
 
-#include <odp/api/rwlock_recursive.h>
+#include <odp/api/spec/rwlock_recursive.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/schedule.h b/platform/linux-generic/include/odp/api/schedule.h
index cb4ac2f91..002648517 100644
--- a/platform/linux-generic/include/odp/schedule.h
+++ b/platform/linux-generic/include/odp/api/schedule.h
@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-#include <odp/plat/schedule_types.h>
+#include <odp/api/plat/schedule_types.h>
 
 /** @ingroup odp_scheduler
  *  @{
@@ -27,7 +27,7 @@ extern "C" {
  * @}
  */
 
-#include <odp/api/schedule.h>
+#include <odp/api/spec/schedule.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/schedule_types.h b/platform/linux-generic/include/odp/api/schedule_types.h
index 784ed8527..536007d66 100644
--- a/platform/linux-generic/include/odp/schedule_types.h
+++ b/platform/linux-generic/include/odp/api/schedule_types.h
@@ -17,9 +17,9 @@
 extern "C" {
 #endif
 
-#include <odp/plat/schedule_types.h>
+#include <odp/api/plat/schedule_types.h>
 
-#include <odp/api/schedule_types.h>
+#include <odp/api/spec/schedule_types.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/shared_memory.h b/platform/linux-generic/include/odp/api/shared_memory.h
index 957be560a..affc290e7 100644
--- a/platform/linux-generic/include/odp/shared_memory.h
+++ b/platform/linux-generic/include/odp/api/shared_memory.h
@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-#include <odp/plat/shared_memory_types.h>
+#include <odp/api/plat/shared_memory_types.h>
 
 /** @ingroup odp_shared_memory
  *  @{
@@ -27,7 +27,7 @@ extern "C" {
  * @}
  */
 
-#include <odp/api/shared_memory.h>
+#include <odp/api/spec/shared_memory.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/spinlock.h b/platform/linux-generic/include/odp/api/spinlock.h
index 046fcfada..830f4edd2 100644
--- a/platform/linux-generic/include/odp/spinlock.h
+++ b/platform/linux-generic/include/odp/api/spinlock.h
@@ -17,9 +17,9 @@
 extern "C" {
 #endif
 
-#include <odp/plat/spinlock_types.h>
+#include <odp/api/plat/spinlock_types.h>
 
-#include <odp/api/spinlock.h>
+#include <odp/api/spec/spinlock.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/spinlock_recursive.h b/platform/linux-generic/include/odp/api/spinlock_recursive.h
index e8a996837..d97b0173a 100644
--- a/platform/linux-generic/include/odp/spinlock_recursive.h
+++ b/platform/linux-generic/include/odp/api/spinlock_recursive.h
@@ -17,9 +17,9 @@
 extern "C" {
 #endif
 
-#include <odp/plat/spinlock_recursive_types.h>
+#include <odp/api/plat/spinlock_recursive_types.h>
 
-#include <odp/api/spinlock_recursive.h>
+#include <odp/api/spec/spinlock_recursive.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/std_clib.h b/platform/linux-generic/include/odp/api/std_clib.h
index 11c59bec2..1578d09f1 100644
--- a/platform/linux-generic/include/odp/std_clib.h
+++ b/platform/linux-generic/include/odp/api/std_clib.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include <odp/api/std_types.h>
+#include <odp/api/spec/std_types.h>
 
 static inline void *odp_memcpy(void *dst, const void *src, size_t num)
 {
diff --git a/platform/linux-generic/include/odp/std_types.h b/platform/linux-generic/include/odp/api/std_types.h
index 56b5a4ee8..5737e43b2 100644
--- a/platform/linux-generic/include/odp/std_types.h
+++ b/platform/linux-generic/include/odp/api/std_types.h
@@ -37,7 +37,7 @@ typedef int odp_bool_t;
  * @}
  */
 
-#include <odp/api/std_types.h>
+#include <odp/api/spec/std_types.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/sync.h b/platform/linux-generic/include/odp/api/sync.h
index b2995e19c..45fe6bdb0 100644
--- a/platform/linux-generic/include/odp/sync.h
+++ b/platform/linux-generic/include/odp/api/sync.h
@@ -40,7 +40,7 @@ static inline void odp_mb_full(void)
  * @}
  */
 
-#include <odp/api/sync.h>
+#include <odp/api/spec/sync.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/system_info.h b/platform/linux-generic/include/odp/api/system_info.h
index d6926061e..36ddc814b 100644
--- a/platform/linux-generic/include/odp/system_info.h
+++ b/platform/linux-generic/include/odp/api/system_info.h
@@ -17,10 +17,10 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
+#include <odp/api/std_types.h>
 
 
-#include <odp/api/system_info.h>
+#include <odp/api/spec/system_info.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/thread.h b/platform/linux-generic/include/odp/api/thread.h
index 522ca2599..c54abc890 100644
--- a/platform/linux-generic/include/odp/thread.h
+++ b/platform/linux-generic/include/odp/api/thread.h
@@ -17,9 +17,9 @@
 extern "C" {
 #endif
 
-#include <odp/plat/thread_types.h>
+#include <odp/api/plat/thread_types.h>
 
-#include <odp/api/thread.h>
+#include <odp/api/spec/thread.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/thrmask.h b/platform/linux-generic/include/odp/api/thrmask.h
index 0e98ece57..b1c207775 100644
--- a/platform/linux-generic/include/odp/thrmask.h
+++ b/platform/linux-generic/include/odp/api/thrmask.h
@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-#include <odp/plat/thrmask_types.h>
+#include <odp/api/plat/thrmask_types.h>
 
 /** @ingroup odp_thread
  *  @{
@@ -27,7 +27,7 @@ extern "C" {
  * @}
  */
 
-#include <odp/api/thrmask.h>
+#include <odp/api/spec/thrmask.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/ticketlock.h b/platform/linux-generic/include/odp/api/ticketlock.h
index d3491519a..85be4bc5c 100644
--- a/platform/linux-generic/include/odp/ticketlock.h
+++ b/platform/linux-generic/include/odp/api/ticketlock.h
@@ -17,9 +17,9 @@
 extern "C" {
 #endif
 
-#include <odp/plat/ticketlock_types.h>
+#include <odp/api/plat/ticketlock_types.h>
 
-#include <odp/api/ticketlock.h>
+#include <odp/api/spec/ticketlock.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/time.h b/platform/linux-generic/include/odp/api/time.h
index 44e0d0d25..8d1c33e68 100644
--- a/platform/linux-generic/include/odp/time.h
+++ b/platform/linux-generic/include/odp/api/time.h
@@ -17,12 +17,12 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
+#include <odp/api/std_types.h>
 
 
 
-#include <odp/plat/time_types.h>
-#include <odp/api/time.h>
+#include <odp/api/plat/time_types.h>
+#include <odp/api/spec/time.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/timer.h b/platform/linux-generic/include/odp/api/timer.h
index 3e9cd4e7e..1450727f8 100644
--- a/platform/linux-generic/include/odp/timer.h
+++ b/platform/linux-generic/include/odp/api/timer.h
@@ -17,11 +17,11 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
-#include <odp/plat/event_types.h>
-#include <odp/plat/pool_types.h>
-#include <odp/plat/queue_types.h>
-#include <odp/plat/timer_types.h>
+#include <odp/api/std_types.h>
+#include <odp/api/plat/event_types.h>
+#include <odp/api/plat/pool_types.h>
+#include <odp/api/plat/queue_types.h>
+#include <odp/api/plat/timer_types.h>
 
 /** @ingroup odp_timer
  *  @{
@@ -31,7 +31,7 @@ extern "C" {
  * @}
  */
 
-#include <odp/api/timer.h>
+#include <odp/api/spec/timer.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp/version.h b/platform/linux-generic/include/odp/api/version.h
index c98cb3097..fc4ea5865 100644
--- a/platform/linux-generic/include/odp/version.h
+++ b/platform/linux-generic/include/odp/api/version.h
@@ -17,8 +17,8 @@
 extern "C" {
 #endif
 
-#include <odp/plat/version_types.h>
-#include <odp/api/version.h>
+#include <odp/api/plat/version_types.h>
+#include <odp/api/spec/version.h>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/odp_align_internal.h b/platform/linux-generic/include/odp_align_internal.h
index 4ca5ceb3b..9ccde5320 100644
--- a/platform/linux-generic/include/odp_align_internal.h
+++ b/platform/linux-generic/include/odp_align_internal.h
@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-#include <odp/align.h>
+#include <odp/api/align.h>
 
 /** @addtogroup odp_compiler_optim
  *  @{
diff --git a/platform/linux-generic/include/odp_atomic_internal.h b/platform/linux-generic/include/odp_atomic_internal.h
index ff3813f73..093280fd1 100644
--- a/platform/linux-generic/include/odp_atomic_internal.h
+++ b/platform/linux-generic/include/odp_atomic_internal.h
@@ -16,10 +16,10 @@
 #ifndef ODP_ATOMIC_INTERNAL_H_
 #define ODP_ATOMIC_INTERNAL_H_
 
-#include <odp/std_types.h>
-#include <odp/align.h>
-#include <odp/hints.h>
-#include <odp/atomic.h>
+#include <odp/api/std_types.h>
+#include <odp/api/align.h>
+#include <odp/api/hints.h>
+#include <odp/api/atomic.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/platform/linux-generic/include/odp_buffer_internal.h b/platform/linux-generic/include/odp_buffer_internal.h
index abdd320b4..7a06b00d7 100644
--- a/platform/linux-generic/include/odp_buffer_internal.h
+++ b/platform/linux-generic/include/odp_buffer_internal.h
@@ -18,17 +18,17 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
-#include <odp/atomic.h>
-#include <odp/pool.h>
-#include <odp/buffer.h>
-#include <odp/debug.h>
-#include <odp/align.h>
+#include <odp/api/std_types.h>
+#include <odp/api/atomic.h>
+#include <odp/api/pool.h>
+#include <odp/api/buffer.h>
+#include <odp/api/debug.h>
+#include <odp/api/align.h>
 #include <odp_align_internal.h>
-#include <odp/config.h>
-#include <odp/byteorder.h>
-#include <odp/thread.h>
-#include <odp/event.h>
+#include <odp/api/config.h>
+#include <odp/api/byteorder.h>
+#include <odp/api/thread.h>
+#include <odp/api/event.h>
 #include <odp_forward_typedefs_internal.h>
 
 #define ODP_BITSIZE(x) \
diff --git a/platform/linux-generic/include/odp_classification_datamodel.h b/platform/linux-generic/include/odp_classification_datamodel.h
index 6301f18e1..63f3ec6ac 100644
--- a/platform/linux-generic/include/odp_classification_datamodel.h
+++ b/platform/linux-generic/include/odp_classification_datamodel.h
@@ -19,8 +19,8 @@
 extern "C" {
 #endif
 
-#include <odp/spinlock.h>
-#include <odp/classification.h>
+#include <odp/api/spinlock.h>
+#include <odp/api/classification.h>
 #include <odp_pool_internal.h>
 #include <odp_packet_internal.h>
 #include <odp_packet_io_internal.h>
diff --git a/platform/linux-generic/include/odp_classification_inlines.h b/platform/linux-generic/include/odp_classification_inlines.h
index 96cf77ee2..8bd010d09 100644
--- a/platform/linux-generic/include/odp_classification_inlines.h
+++ b/platform/linux-generic/include/odp_classification_inlines.h
@@ -18,7 +18,7 @@
 extern "C" {
 #endif
 
-#include <odp/debug.h>
+#include <odp/api/debug.h>
 #include <odp/helper/eth.h>
 #include <odp/helper/ip.h>
 #include <odp/helper/ipsec.h>
diff --git a/platform/linux-generic/include/odp_classification_internal.h b/platform/linux-generic/include/odp_classification_internal.h
index d85eb9801..86b40fc97 100644
--- a/platform/linux-generic/include/odp_classification_internal.h
+++ b/platform/linux-generic/include/odp_classification_internal.h
@@ -19,10 +19,10 @@
 extern "C" {
 #endif
 
-#include <odp/classification.h>
-#include <odp/queue.h>
+#include <odp/api/classification.h>
+#include <odp/api/queue.h>
 #include <odp_packet_internal.h>
-#include <odp/packet_io.h>
+#include <odp/api/packet_io.h>
 #include <odp_packet_io_internal.h>
 #include <odp_classification_datamodel.h>
 
diff --git a/platform/linux-generic/include/odp_debug_internal.h b/platform/linux-generic/include/odp_debug_internal.h
index 24608e12a..02ae87a90 100644
--- a/platform/linux-generic/include/odp_debug_internal.h
+++ b/platform/linux-generic/include/odp_debug_internal.h
@@ -18,7 +18,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <odp/debug.h>
+#include <odp/api/debug.h>
 #include <odp_internal.h>
 #ifdef __cplusplus
 extern "C" {
diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h
index 98a569907..1819b77ff 100644
--- a/platform/linux-generic/include/odp_internal.h
+++ b/platform/linux-generic/include/odp_internal.h
@@ -18,8 +18,8 @@
 extern "C" {
 #endif
 
-#include <odp/init.h>
-#include <odp/thread.h>
+#include <odp/api/init.h>
+#include <odp/api/thread.h>
 #include <stdio.h>
 #include <sys/types.h>
 
diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h
index 85d4924d7..157d4723b 100644
--- a/platform/linux-generic/include/odp_packet_internal.h
+++ b/platform/linux-generic/include/odp_packet_internal.h
@@ -18,14 +18,14 @@
 extern "C" {
 #endif
 
-#include <odp/align.h>
-#include <odp/debug.h>
+#include <odp/api/align.h>
+#include <odp/api/debug.h>
 #include <odp_buffer_internal.h>
 #include <odp_pool_internal.h>
 #include <odp_buffer_inlines.h>
-#include <odp/packet.h>
-#include <odp/packet_io.h>
-#include <odp/crypto.h>
+#include <odp/api/packet.h>
+#include <odp/api/packet_io.h>
+#include <odp/api/crypto.h>
 #include <odp_crypto_internal.h>
 
 #define PACKET_JUMBO_LEN	(9 * 1024)
diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h
index f871f0a76..fd66983e1 100644
--- a/platform/linux-generic/include/odp_packet_io_internal.h
+++ b/platform/linux-generic/include/odp_packet_io_internal.h
@@ -18,14 +18,14 @@
 extern "C" {
 #endif
 
-#include <odp/spinlock.h>
-#include <odp/ticketlock.h>
+#include <odp/api/spinlock.h>
+#include <odp/api/ticketlock.h>
 #include <odp_classification_datamodel.h>
 #include <odp_align_internal.h>
 #include <odp_debug_internal.h>
 
-#include <odp/config.h>
-#include <odp/hints.h>
+#include <odp/api/config.h>
+#include <odp/api/hints.h>
 #include <net/if.h>
 
 #define PKTIO_MAX_QUEUES 64
diff --git a/platform/linux-generic/include/odp_packet_netmap.h b/platform/linux-generic/include/odp_packet_netmap.h
index b7990d9e9..85fbf086d 100644
--- a/platform/linux-generic/include/odp_packet_netmap.h
+++ b/platform/linux-generic/include/odp_packet_netmap.h
@@ -7,11 +7,11 @@
 #ifndef ODP_PACKET_NETMAP_H
 #define ODP_PACKET_NETMAP_H
 
-#include <odp/align.h>
-#include <odp/debug.h>
-#include <odp/packet_io.h>
-#include <odp/pool.h>
-#include <odp/ticketlock.h>
+#include <odp/api/align.h>
+#include <odp/api/debug.h>
+#include <odp/api/packet_io.h>
+#include <odp/api/pool.h>
+#include <odp/api/ticketlock.h>
 #include <odp_align_internal.h>
 
 #include <linux/if_ether.h>
diff --git a/platform/linux-generic/include/odp_packet_socket.h b/platform/linux-generic/include/odp_packet_socket.h
index a7797d1c0..08ffc6a38 100644
--- a/platform/linux-generic/include/odp_packet_socket.h
+++ b/platform/linux-generic/include/odp_packet_socket.h
@@ -13,12 +13,12 @@
 #include <sys/socket.h>
 #include <string.h>
 
-#include <odp/align.h>
-#include <odp/buffer.h>
-#include <odp/debug.h>
-#include <odp/pool.h>
-#include <odp/packet.h>
-#include <odp/packet_io.h>
+#include <odp/api/align.h>
+#include <odp/api/buffer.h>
+#include <odp/api/debug.h>
+#include <odp/api/pool.h>
+#include <odp/api/packet.h>
+#include <odp/api/packet_io.h>
 
 #include <linux/version.h>
 
diff --git a/platform/linux-generic/include/odp_packet_tap.h b/platform/linux-generic/include/odp_packet_tap.h
index 787758674..a90bfbce0 100644
--- a/platform/linux-generic/include/odp_packet_tap.h
+++ b/platform/linux-generic/include/odp_packet_tap.h
@@ -7,7 +7,7 @@
 #ifndef ODP_PACKET_TAP_H_
 #define ODP_PACKET_TAP_H_
 
-#include <odp/pool.h>
+#include <odp/api/pool.h>
 
 typedef struct {
 	int fd;				/**< file descriptor for tap interface*/
diff --git a/platform/linux-generic/include/odp_pool_internal.h b/platform/linux-generic/include/odp_pool_internal.h
index fdac6067e..6832b316c 100644
--- a/platform/linux-generic/include/odp_pool_internal.h
+++ b/platform/linux-generic/include/odp_pool_internal.h
@@ -18,17 +18,17 @@
 extern "C" {
 #endif
 
-#include <odp/std_types.h>
-#include <odp/align.h>
+#include <odp/api/std_types.h>
+#include <odp/api/align.h>
 #include <odp_align_internal.h>
-#include <odp/pool.h>
+#include <odp/api/pool.h>
 #include <odp_buffer_internal.h>
-#include <odp/hints.h>
-#include <odp/config.h>
-#include <odp/debug.h>
-#include <odp/shared_memory.h>
-#include <odp/atomic.h>
-#include <odp/thread.h>
+#include <odp/api/hints.h>
+#include <odp/api/config.h>
+#include <odp/api/debug.h>
+#include <odp/api/shared_memory.h>
+#include <odp/api/atomic.h>
+#include <odp/api/thread.h>
 #include <string.h>
 
 /**
@@ -67,12 +67,12 @@ typedef struct local_cache_t {
 #define POOL_USE_TICKETLOCK
 
 #ifdef POOL_USE_TICKETLOCK
-#include <odp/ticketlock.h>
+#include <odp/api/ticketlock.h>
 #define POOL_LOCK(a)      odp_ticketlock_lock(a)
 #define POOL_UNLOCK(a)    odp_ticketlock_unlock(a)
 #define POOL_LOCK_INIT(a) odp_ticketlock_init(a)
 #else
-#include <odp/spinlock.h>
+#include <odp/api/spinlock.h>
 #define POOL_LOCK(a)      odp_spinlock_lock(a)
 #define POOL_UNLOCK(a)    odp_spinlock_unlock(a)
 #define POOL_LOCK_INIT(a) odp_spinlock_init(a)
diff --git a/platform/linux-generic/include/odp_queue_internal.h b/platform/linux-generic/include/odp_queue_internal.h
index 2d349466f..11b64a996 100644
--- a/platform/linux-generic/include/odp_queue_internal.h
+++ b/platform/linux-generic/include/odp_queue_internal.h
@@ -18,21 +18,21 @@
 extern "C" {
 #endif
 
-#include <odp/queue.h>
+#include <odp/api/queue.h>
 #include <odp_forward_typedefs_internal.h>
 #include <odp_buffer_internal.h>
 #include <odp_align_internal.h>
-#include <odp/packet_io.h>
-#include <odp/align.h>
-#include <odp/hints.h>
+#include <odp/api/packet_io.h>
+#include <odp/api/align.h>
+#include <odp/api/hints.h>
 
 
 #define USE_TICKETLOCK
 
 #ifdef USE_TICKETLOCK
-#include <odp/ticketlock.h>
+#include <odp/api/ticketlock.h>
 #else
-#include <odp/spinlock.h>
+#include <odp/api/spinlock.h>
 #endif
 
 #define QUEUE_MULTI_MAX 8
diff --git a/platform/linux-generic/include/odp_schedule_internal.h b/platform/linux-generic/include/odp_schedule_internal.h
index 08683941a..fe8ff7b5e 100644
--- a/platform/linux-generic/include/odp_schedule_internal.h
+++ b/platform/linux-generic/include/odp_schedule_internal.h
@@ -14,10 +14,10 @@ extern "C" {
 #endif
 
 
-#include <odp/buffer.h>
+#include <odp/api/buffer.h>
 #include <odp_buffer_internal.h>
-#include <odp/queue.h>
-#include <odp/packet_io.h>
+#include <odp/api/queue.h>
+#include <odp/api/packet_io.h>
 #include <odp_queue_internal.h>
 
 int schedule_queue_init(queue_entry_t *qe);
diff --git a/platform/linux-generic/include/odp_timer_internal.h b/platform/linux-generic/include/odp_timer_internal.h
index 8b0e93dc0..b1cd73f71 100644
--- a/platform/linux-generic/include/odp_timer_internal.h
+++ b/platform/linux-generic/include/odp_timer_internal.h
@@ -14,11 +14,11 @@
 #ifndef ODP_TIMER_INTERNAL_H_
 #define ODP_TIMER_INTERNAL_H_
 
-#include <odp/align.h>
-#include <odp/debug.h>
+#include <odp/api/align.h>
+#include <odp/api/debug.h>
 #include <odp_buffer_internal.h>
 #include <odp_pool_internal.h>
-#include <odp/timer.h>
+#include <odp/api/timer.h>
 
 /**
  * Internal Timeout header
diff --git a/platform/linux-generic/odp_atomic.c b/platform/linux-generic/odp_atomic.c
index 5b71ecff3..680e66d87 100644
--- a/platform/linux-generic/odp_atomic.c
+++ b/platform/linux-generic/odp_atomic.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/atomic.h>
+#include <odp/api/atomic.h>
 
 int odp_atomic_lock_free_u64(odp_atomic_op_t *atomic_op)
 {
diff --git a/platform/linux-generic/odp_barrier.c b/platform/linux-generic/odp_barrier.c
index f3525e209..ef10f29da 100644
--- a/platform/linux-generic/odp_barrier.c
+++ b/platform/linux-generic/odp_barrier.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/barrier.h>
-#include <odp/sync.h>
-#include <odp/cpu.h>
-#include <odp/atomic.h>
+#include <odp/api/barrier.h>
+#include <odp/api/sync.h>
+#include <odp/api/cpu.h>
+#include <odp/api/atomic.h>
 
 void odp_barrier_init(odp_barrier_t *barrier, int count)
 {
diff --git a/platform/linux-generic/odp_buffer.c b/platform/linux-generic/odp_buffer.c
index ec2bbba7f..69f913d25 100644
--- a/platform/linux-generic/odp_buffer.c
+++ b/platform/linux-generic/odp_buffer.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/buffer.h>
+#include <odp/api/buffer.h>
 #include <odp_pool_internal.h>
 #include <odp_buffer_internal.h>
 #include <odp_buffer_inlines.h>
diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c
index 9834d3668..6c9f7c197 100644
--- a/platform/linux-generic/odp_classification.c
+++ b/platform/linux-generic/odp_classification.c
@@ -4,23 +4,23 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/classification.h>
-#include <odp/align.h>
-#include <odp/queue.h>
-#include <odp/debug.h>
+#include <odp/api/classification.h>
+#include <odp/api/align.h>
+#include <odp/api/queue.h>
+#include <odp/api/debug.h>
 #include <odp_internal.h>
 #include <odp_debug_internal.h>
 #include <odp_packet_internal.h>
-#include <odp/packet_io.h>
+#include <odp/api/packet_io.h>
 #include <odp_packet_io_internal.h>
 #include <odp_classification_datamodel.h>
 #include <odp_classification_inlines.h>
 #include <odp_classification_internal.h>
 #include <odp_pool_internal.h>
-#include <odp/shared_memory.h>
+#include <odp/api/shared_memory.h>
 #include <odp/helper/eth.h>
 #include <string.h>
-#include <odp/spinlock.h>
+#include <odp/api/spinlock.h>
 
 #define LOCK(a)      odp_spinlock_lock(a)
 #define UNLOCK(a)    odp_spinlock_unlock(a)
diff --git a/platform/linux-generic/odp_cpu.c b/platform/linux-generic/odp_cpu.c
index 4bd6a9a07..282defd44 100644
--- a/platform/linux-generic/odp_cpu.c
+++ b/platform/linux-generic/odp_cpu.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/cpu.h>
-#include <odp/hints.h>
+#include <odp/api/cpu.h>
+#include <odp/api/hints.h>
 
 uint64_t odp_cpu_cycles_diff(uint64_t c2, uint64_t c1)
 {
diff --git a/platform/linux-generic/odp_cpumask.c b/platform/linux-generic/odp_cpumask.c
index c5c12602c..4249f1dc2 100644
--- a/platform/linux-generic/odp_cpumask.c
+++ b/platform/linux-generic/odp_cpumask.c
@@ -9,7 +9,7 @@
 #include <sched.h>
 #include <pthread.h>
 
-#include <odp/cpumask.h>
+#include <odp/api/cpumask.h>
 #include <odp_debug_internal.h>
 
 #include <stdlib.h>
diff --git a/platform/linux-generic/odp_cpumask_task.c b/platform/linux-generic/odp_cpumask_task.c
index c5093e051..dbedff246 100644
--- a/platform/linux-generic/odp_cpumask_task.c
+++ b/platform/linux-generic/odp_cpumask_task.c
@@ -9,7 +9,7 @@
 #include <sched.h>
 #include <pthread.h>
 
-#include <odp/cpumask.h>
+#include <odp/api/cpumask.h>
 #include <odp_debug_internal.h>
 
 int odp_cpumask_default_worker(odp_cpumask_t *mask, int num)
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 65e850343..08b479d8d 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -4,18 +4,18 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/crypto.h>
+#include <odp/api/crypto.h>
 #include <odp_internal.h>
-#include <odp/atomic.h>
-#include <odp/spinlock.h>
-#include <odp/sync.h>
-#include <odp/debug.h>
-#include <odp/align.h>
-#include <odp/shared_memory.h>
+#include <odp/api/atomic.h>
+#include <odp/api/spinlock.h>
+#include <odp/api/sync.h>
+#include <odp/api/debug.h>
+#include <odp/api/align.h>
+#include <odp/api/shared_memory.h>
 #include <odp_crypto_internal.h>
 #include <odp_debug_internal.h>
-#include <odp/hints.h>
-#include <odp/random.h>
+#include <odp/api/hints.h>
+#include <odp/api/random.h>
 #include <odp_packet_internal.h>
 
 #include <string.h>
diff --git a/platform/linux-generic/odp_errno.c b/platform/linux-generic/odp_errno.c
index 1a76d4366..408a4b95f 100644
--- a/platform/linux-generic/odp_errno.c
+++ b/platform/linux-generic/odp_errno.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
-#include <odp/errno.h>
+#include <odp/api/errno.h>
 #include <odp_internal.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/platform/linux-generic/odp_event.c b/platform/linux-generic/odp_event.c
index 30dde56a3..cc3fb0ad1 100644
--- a/platform/linux-generic/odp_event.c
+++ b/platform/linux-generic/odp_event.c
@@ -4,12 +4,12 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/event.h>
-#include <odp/buffer.h>
-#include <odp/crypto.h>
-#include <odp/packet.h>
-#include <odp/timer.h>
-#include <odp/pool.h>
+#include <odp/api/event.h>
+#include <odp/api/buffer.h>
+#include <odp/api/crypto.h>
+#include <odp/api/packet.h>
+#include <odp/api/timer.h>
+#include <odp/api/pool.h>
 #include <odp_buffer_internal.h>
 #include <odp_buffer_inlines.h>
 #include <odp_debug_internal.h>
diff --git a/platform/linux-generic/odp_hash.c b/platform/linux-generic/odp_hash.c
index 6bee4ef6c..0e092824d 100644
--- a/platform/linux-generic/odp_hash.c
+++ b/platform/linux-generic/odp_hash.c
@@ -37,8 +37,8 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <odp/hash.h>
-#include <odp/std_types.h>
+#include <odp/api/hash.h>
+#include <odp/api/std_types.h>
 
 static const uint32_t crc32c_tables[8][256] = {{
 	0x00000000, 0xF26B8303, 0xE13B70F7, 0x1350F3F4, 0xC79A971F, 0x35F1141C,
diff --git a/platform/linux-generic/odp_impl.c b/platform/linux-generic/odp_impl.c
index 186280435..0b89af7d7 100644
--- a/platform/linux-generic/odp_impl.c
+++ b/platform/linux-generic/odp_impl.c
@@ -18,7 +18,7 @@
 extern "C" {
 #endif
 
-#include <odp/version.h>
+#include <odp/api/version.h>
 
 #define ODP_VERSION_IMPL 0
 #define ODP_VERSION_IMPL_STR \
diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c
index 4a5e687d3..82259fed2 100644
--- a/platform/linux-generic/odp_init.c
+++ b/platform/linux-generic/odp_init.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/init.h>
+#include <odp/api/init.h>
 #include <odp_internal.h>
-#include <odp/debug.h>
+#include <odp/api/debug.h>
 #include <odp_debug_internal.h>
 #include <unistd.h>
 
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index db85b5e5e..2a4f31231 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -4,11 +4,11 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/packet.h>
+#include <odp/api/packet.h>
 #include <odp_packet_internal.h>
 #include <odp_debug_internal.h>
-#include <odp/hints.h>
-#include <odp/byteorder.h>
+#include <odp/api/hints.h>
+#include <odp/api/byteorder.h>
 
 #include <odp/helper/eth.h>
 #include <odp/helper/ip.h>
diff --git a/platform/linux-generic/odp_packet_flags.c b/platform/linux-generic/odp_packet_flags.c
index dbc313748..d4aa3c238 100644
--- a/platform/linux-generic/odp_packet_flags.c
+++ b/platform/linux-generic/odp_packet_flags.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/packet_flags.h>
+#include <odp/api/packet_flags.h>
 #include <odp_packet_internal.h>
 
 #define retflag(p, x) do {			       \
diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c
index 27b65530a..fe961335e 100644
--- a/platform/linux-generic/odp_packet_io.c
+++ b/platform/linux-generic/odp_packet_io.c
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/packet_io.h>
+#include <odp/api/packet_io.h>
 #include <odp_packet_io_internal.h>
 #include <odp_packet_io_queue.h>
-#include <odp/packet.h>
+#include <odp/api/packet.h>
 #include <odp_packet_internal.h>
 #include <odp_internal.h>
-#include <odp/spinlock.h>
-#include <odp/ticketlock.h>
-#include <odp/shared_memory.h>
+#include <odp/api/spinlock.h>
+#include <odp/api/ticketlock.h>
+#include <odp/api/shared_memory.h>
 #include <odp_packet_socket.h>
-#include <odp/config.h>
+#include <odp/api/config.h>
 #include <odp_queue_internal.h>
 #include <odp_schedule_internal.h>
 #include <odp_classification_internal.h>
diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c
index 64668cc3d..588362b21 100644
--- a/platform/linux-generic/odp_pool.c
+++ b/platform/linux-generic/odp_pool.c
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/std_types.h>
-#include <odp/pool.h>
+#include <odp/api/std_types.h>
+#include <odp/api/pool.h>
 #include <odp_buffer_internal.h>
 #include <odp_pool_internal.h>
 #include <odp_buffer_inlines.h>
 #include <odp_packet_internal.h>
 #include <odp_timer_internal.h>
 #include <odp_align_internal.h>
-#include <odp/shared_memory.h>
-#include <odp/align.h>
+#include <odp/api/shared_memory.h>
+#include <odp/api/align.h>
 #include <odp_internal.h>
-#include <odp/config.h>
-#include <odp/hints.h>
-#include <odp/thread.h>
+#include <odp/api/config.h>
+#include <odp/api/hints.h>
+#include <odp/api/thread.h>
 #include <odp_debug_internal.h>
 
 #include <string.h>
diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c
index dbe2d9ce7..b4115b228 100644
--- a/platform/linux-generic/odp_queue.c
+++ b/platform/linux-generic/odp_queue.c
@@ -4,33 +4,33 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/queue.h>
+#include <odp/api/queue.h>
 #include <odp_queue_internal.h>
-#include <odp/std_types.h>
-#include <odp/align.h>
-#include <odp/buffer.h>
+#include <odp/api/std_types.h>
+#include <odp/api/align.h>
+#include <odp/api/buffer.h>
 #include <odp_buffer_internal.h>
 #include <odp_pool_internal.h>
 #include <odp_buffer_inlines.h>
 #include <odp_internal.h>
-#include <odp/shared_memory.h>
-#include <odp/schedule.h>
+#include <odp/api/shared_memory.h>
+#include <odp/api/schedule.h>
 #include <odp_schedule_internal.h>
-#include <odp/config.h>
+#include <odp/api/config.h>
 #include <odp_packet_io_internal.h>
 #include <odp_packet_io_queue.h>
 #include <odp_debug_internal.h>
-#include <odp/hints.h>
-#include <odp/sync.h>
+#include <odp/api/hints.h>
+#include <odp/api/sync.h>
 
 #ifdef USE_TICKETLOCK
-#include <odp/ticketlock.h>
+#include <odp/api/ticketlock.h>
 #define LOCK(a)      odp_ticketlock_lock(a)
 #define UNLOCK(a)    odp_ticketlock_unlock(a)
 #define LOCK_INIT(a) odp_ticketlock_init(a)
 #define LOCK_TRY(a)  odp_ticketlock_trylock(a)
 #else
-#include <odp/spinlock.h>
+#include <odp/api/spinlock.h>
 #define LOCK(a)      odp_spinlock_lock(a)
 #define UNLOCK(a)    odp_spinlock_unlock(a)
 #define LOCK_INIT(a) odp_spinlock_init(a)
diff --git a/platform/linux-generic/odp_rwlock.c b/platform/linux-generic/odp_rwlock.c
index 42ad0ccdb..f50fd5f2a 100644
--- a/platform/linux-generic/odp_rwlock.c
+++ b/platform/linux-generic/odp_rwlock.c
@@ -5,9 +5,9 @@
  */
 
 #include <stdbool.h>
-#include <odp/atomic.h>
-#include <odp/rwlock.h>
-#include <odp/cpu.h>
+#include <odp/api/atomic.h>
+#include <odp/api/rwlock.h>
+#include <odp/api/cpu.h>
 
 void odp_rwlock_init(odp_rwlock_t *rwlock)
 {
diff --git a/platform/linux-generic/odp_rwlock_recursive.c b/platform/linux-generic/odp_rwlock_recursive.c
index e3a383caf..2338b535b 100644
--- a/platform/linux-generic/odp_rwlock_recursive.c
+++ b/platform/linux-generic/odp_rwlock_recursive.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/rwlock_recursive.h>
-#include <odp/thread.h>
+#include <odp/api/rwlock_recursive.h>
+#include <odp/api/thread.h>
 #include <string.h>
 
 #define NO_OWNER (-1)
diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c
index fc54ee5d0..2e2407917 100644
--- a/platform/linux-generic/odp_schedule.c
+++ b/platform/linux-generic/odp_schedule.c
@@ -5,21 +5,21 @@
  */
 
 #include <string.h>
-#include <odp/schedule.h>
+#include <odp/api/schedule.h>
 #include <odp_schedule_internal.h>
-#include <odp/align.h>
-#include <odp/queue.h>
-#include <odp/shared_memory.h>
-#include <odp/buffer.h>
-#include <odp/pool.h>
+#include <odp/api/align.h>
+#include <odp/api/queue.h>
+#include <odp/api/shared_memory.h>
+#include <odp/api/buffer.h>
+#include <odp/api/pool.h>
 #include <odp_internal.h>
-#include <odp/config.h>
+#include <odp/api/config.h>
 #include <odp_debug_internal.h>
-#include <odp/thread.h>
-#include <odp/time.h>
-#include <odp/spinlock.h>
-#include <odp/hints.h>
-#include <odp/cpu.h>
+#include <odp/api/thread.h>
+#include <odp/api/time.h>
+#include <odp/api/spinlock.h>
+#include <odp/api/hints.h>
+#include <odp/api/cpu.h>
 
 #include <odp_queue_internal.h>
 #include <odp_packet_io_internal.h>
diff --git a/platform/linux-generic/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c
index 81000cbfd..15ee0a739 100644
--- a/platform/linux-generic/odp_shared_memory.c
+++ b/platform/linux-generic/odp_shared_memory.c
@@ -6,15 +6,15 @@
 
 #include <odp_posix_extensions.h>
 
-#include <odp/shared_memory.h>
+#include <odp/api/shared_memory.h>
 #include <odp_internal.h>
-#include <odp/spinlock.h>
-#include <odp/align.h>
-#include <odp/system_info.h>
-#include <odp/debug.h>
+#include <odp/api/spinlock.h>
+#include <odp/api/align.h>
+#include <odp/api/system_info.h>
+#include <odp/api/debug.h>
 #include <odp_debug_internal.h>
 #include <odp_align_internal.h>
-#include <odp/config.h>
+#include <odp/api/config.h>
 
 #include <unistd.h>
 #include <sys/mman.h>
diff --git a/platform/linux-generic/odp_spinlock.c b/platform/linux-generic/odp_spinlock.c
index 6a16dc4b9..6fc138b44 100644
--- a/platform/linux-generic/odp_spinlock.c
+++ b/platform/linux-generic/odp_spinlock.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/spinlock.h>
-#include <odp/cpu.h>
+#include <odp/api/spinlock.h>
+#include <odp/api/cpu.h>
 #include <odp_atomic_internal.h>
 
 void odp_spinlock_init(odp_spinlock_t *spinlock)
diff --git a/platform/linux-generic/odp_spinlock_recursive.c b/platform/linux-generic/odp_spinlock_recursive.c
index 8ffe6b3dd..5ed481c4a 100644
--- a/platform/linux-generic/odp_spinlock_recursive.c
+++ b/platform/linux-generic/odp_spinlock_recursive.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/spinlock_recursive.h>
-#include <odp/thread.h>
+#include <odp/api/spinlock_recursive.h>
+#include <odp/api/thread.h>
 
 #define NO_OWNER (-1)
 
diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c
index 42aef8a11..a64dd0abc 100644
--- a/platform/linux-generic/odp_system_info.c
+++ b/platform/linux-generic/odp_system_info.c
@@ -6,11 +6,11 @@
 
 #include <odp_posix_extensions.h>
 
-#include <odp/system_info.h>
+#include <odp/api/system_info.h>
 #include <odp_internal.h>
 #include <odp_debug_internal.h>
-#include <odp/align.h>
-#include <odp/cpu.h>
+#include <odp/api/align.h>
+#include <odp/api/cpu.h>
 #include <pthread.h>
 #include <sched.h>
 #include <string.h>
diff --git a/platform/linux-generic/odp_thread.c b/platform/linux-generic/odp_thread.c
index 4ac1c37e2..420e4eb2f 100644
--- a/platform/linux-generic/odp_thread.c
+++ b/platform/linux-generic/odp_thread.c
@@ -7,15 +7,15 @@
 #include <odp_posix_extensions.h>
 
 #include <sched.h>
-#include <odp/thread.h>
-#include <odp/thrmask.h>
+#include <odp/api/thread.h>
+#include <odp/api/thrmask.h>
 #include <odp_internal.h>
-#include <odp/spinlock.h>
-#include <odp/config.h>
+#include <odp/api/spinlock.h>
+#include <odp/api/config.h>
 #include <odp_debug_internal.h>
-#include <odp/shared_memory.h>
-#include <odp/align.h>
-#include <odp/cpu.h>
+#include <odp/api/shared_memory.h>
+#include <odp/api/align.h>
+#include <odp/api/cpu.h>
 
 #include <string.h>
 #include <stdio.h>
diff --git a/platform/linux-generic/odp_thrmask.c b/platform/linux-generic/odp_thrmask.c
index 4545a8237..c176a5c6d 100644
--- a/platform/linux-generic/odp_thrmask.c
+++ b/platform/linux-generic/odp_thrmask.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/thrmask.h>
-#include <odp/cpumask.h>
+#include <odp/api/thrmask.h>
+#include <odp/api/cpumask.h>
 
 void odp_thrmask_from_str(odp_thrmask_t *mask, const char *str)
 {
diff --git a/platform/linux-generic/odp_ticketlock.c b/platform/linux-generic/odp_ticketlock.c
index 84b893a5c..7b4246f46 100644
--- a/platform/linux-generic/odp_ticketlock.c
+++ b/platform/linux-generic/odp_ticketlock.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/ticketlock.h>
-#include <odp/atomic.h>
-#include <odp/sync.h>
-#include <odp/cpu.h>
+#include <odp/api/ticketlock.h>
+#include <odp/api/atomic.h>
+#include <odp/api/sync.h>
+#include <odp/api/cpu.h>
 
 void odp_ticketlock_init(odp_ticketlock_t *ticketlock)
 {
diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c
index ca8a95512..040f754b5 100644
--- a/platform/linux-generic/odp_time.c
+++ b/platform/linux-generic/odp_time.c
@@ -7,8 +7,8 @@
 #include <odp_posix_extensions.h>
 
 #include <time.h>
-#include <odp/time.h>
-#include <odp/hints.h>
+#include <odp/api/time.h>
+#include <odp/api/hints.h>
 #include <odp_debug_internal.h>
 
 typedef union {
diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c
index fe3d40f21..ac7270915 100644
--- a/platform/linux-generic/odp_timer.c
+++ b/platform/linux-generic/odp_timer.c
@@ -31,27 +31,27 @@
 #include <unistd.h>
 #include <sys/syscall.h>
 
-#include <odp/align.h>
+#include <odp/api/align.h>
 #include <odp_align_internal.h>
-#include <odp/atomic.h>
+#include <odp/api/atomic.h>
 #include <odp_atomic_internal.h>
-#include <odp/buffer.h>
+#include <odp/api/buffer.h>
 #include <odp_buffer_inlines.h>
-#include <odp/cpu.h>
-#include <odp/pool.h>
+#include <odp/api/cpu.h>
+#include <odp/api/pool.h>
 #include <odp_pool_internal.h>
-#include <odp/debug.h>
+#include <odp/api/debug.h>
 #include <odp_debug_internal.h>
-#include <odp/event.h>
-#include <odp/hints.h>
+#include <odp/api/event.h>
+#include <odp/api/hints.h>
 #include <odp_internal.h>
-#include <odp/queue.h>
-#include <odp/shared_memory.h>
-#include <odp/spinlock.h>
-#include <odp/std_types.h>
-#include <odp/sync.h>
-#include <odp/time.h>
-#include <odp/timer.h>
+#include <odp/api/queue.h>
+#include <odp/api/shared_memory.h>
+#include <odp/api/spinlock.h>
+#include <odp/api/std_types.h>
+#include <odp/api/sync.h>
+#include <odp/api/time.h>
+#include <odp/api/timer.h>
 #include <odp_timer_internal.h>
 
 #define TMO_UNUSED   ((uint64_t)0xFFFFFFFFFFFFFFFF)
diff --git a/platform/linux-generic/odp_version.c b/platform/linux-generic/odp_version.c
index b5219d438..7b704d054 100644
--- a/platform/linux-generic/odp_version.c
+++ b/platform/linux-generic/odp_version.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp/version.h>
+#include <odp/api/version.h>
 
 const char *odp_version_api_str(void)
 {
diff --git a/platform/linux-generic/odp_weak.c b/platform/linux-generic/odp_weak.c
index 21fb5ed10..0fbf6645e 100644
--- a/platform/linux-generic/odp_weak.c
+++ b/platform/linux-generic/odp_weak.c
@@ -5,9 +5,9 @@
  */
 
 #include <odp_internal.h>
-#include <odp/debug.h>
+#include <odp/api/debug.h>
 #include <odp_debug_internal.h>
-#include <odp/hints.h>
+#include <odp/api/hints.h>
 
 #include <stdarg.h>
 
diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c
index e8203ff16..340e106c1 100644
--- a/platform/linux-generic/pktio/loop.c
+++ b/platform/linux-generic/pktio/loop.c
@@ -10,7 +10,7 @@
 #include <odp_packet_io_internal.h>
 #include <odp_classification_internal.h>
 #include <odp_debug_internal.h>
-#include <odp/hints.h>
+#include <odp/api/hints.h>
 
 #include <odp/helper/eth.h>
 #include <odp/helper/ip.h>
diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c
index ed338c2c6..9c5be2272 100644
--- a/platform/linux-generic/pktio/socket.c
+++ b/platform/linux-generic/pktio/socket.c
@@ -41,7 +41,7 @@
 #include <odp_classification_datamodel.h>
 #include <odp_classification_inlines.h>
 #include <odp_classification_internal.h>
-#include <odp/hints.h>
+#include <odp/api/hints.h>
 
 #include <odp/helper/eth.h>
 #include <odp/helper/ip.h>
diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c
index 07fbee63e..887fcccd7 100644
--- a/platform/linux-generic/pktio/socket_mmap.c
+++ b/platform/linux-generic/pktio/socket_mmap.c
@@ -30,7 +30,7 @@
 #include <odp_classification_datamodel.h>
 #include <odp_classification_inlines.h>
 #include <odp_classification_internal.h>
-#include <odp/hints.h>
+#include <odp/api/hints.h>
 
 #include <odp/helper/eth.h>
 #include <odp/helper/ip.h>
diff --git a/test/validation/system/system.c b/test/validation/system/system.c
index ac34b2478..de953f0a7 100644
--- a/test/validation/system/system.c
+++ b/test/validation/system/system.c
@@ -6,7 +6,7 @@
 
 #include <ctype.h>
 #include <odp.h>
-#include <odp/cpumask.h>
+#include <odp/api/cpumask.h>
 #include "odp_cunit_common.h"
 #include "test_debug.h"
 #include "system.h"