api: move ODP headers to a directory

Signed-off-by: Taras Kondratiuk <taras.kondratiuk@linaro.org>
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Reviewed-by: Balasubramanian Manoharan <bala.manoharan@linaro.org>
Reviewed-by: Taras Kondratiuk <taras.kondratiuk@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

75 files changed, 279 insertions, 277 deletions

diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 6bf940c4c..cc24bcbf4 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -6,39 +6,41 @@ AM_CFLAGS +=  -I$(srcdir)/include/api
 AM_CFLAGS +=  -I$(top_srcdir)/helper/include
 
 include_HEADERS = \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_align.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_atomic.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_barrier.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_buffer.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_pool.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_byteorder.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_classification.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_compiler.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_config.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_cpumask.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_crypto.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_debug.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_event.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_hints.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_init.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_packet_flags.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_packet.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_packet_io.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_queue.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_rwlock.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_schedule.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_shared_memory.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_spinlock.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_std_types.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_sync.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_system_info.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_thread.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_ticketlock.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_time.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_timer.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_platform_types.h \
-		  $(top_srcdir)/platform/linux-generic/include/api/odp_version.h
+		  $(top_srcdir)/platform/linux-generic/include/api/odp.h
+odpincludedir= $(includedir)/odp
+odpinclude_HEADERS = \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/align.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/atomic.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/barrier.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/buffer.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/pool.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/byteorder.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/classification.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/compiler.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/config.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/cpumask.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/crypto.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/debug.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/event.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/hints.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/init.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/packet_flags.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/packet.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/packet_io.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/queue.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/rwlock.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/schedule.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/shared_memory.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/spinlock.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/std_types.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/sync.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/system_info.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/thread.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/ticketlock.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/time.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/timer.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/platform_types.h \
+		  $(top_srcdir)/platform/linux-generic/include/api/odp/version.h
 
 noinst_HEADERS = \
 		  ${top_srcdir}/platform/linux-generic/include/odp_align_internal.h \
diff --git a/platform/linux-generic/include/api/odp.h b/platform/linux-generic/include/api/odp.h
index 2a4075f8a..30bed8e0d 100644
--- a/platform/linux-generic/include/api/odp.h
+++ b/platform/linux-generic/include/api/odp.h
@@ -18,38 +18,38 @@
 extern "C" {
 #endif
 
-#include <odp_config.h>
+#include <odp/config.h>
 
-#include <odp_version.h>
-#include <odp_std_types.h>
-#include <odp_compiler.h>
-#include <odp_align.h>
-#include <odp_hints.h>
-#include <odp_debug.h>
-#include <odp_byteorder.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/version.h>
+#include <odp/std_types.h>
+#include <odp/compiler.h>
+#include <odp/align.h>
+#include <odp/hints.h>
+#include <odp/debug.h>
+#include <odp/byteorder.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>
 
 #ifdef __cplusplus
 }
diff --git a/platform/linux-generic/include/api/odp_align.h b/platform/linux-generic/include/api/odp/align.h
index 741f9fd76..741f9fd76 100644
--- a/platform/linux-generic/include/api/odp_align.h
+++ b/platform/linux-generic/include/api/odp/align.h
diff --git a/platform/linux-generic/include/api/odp_atomic.h b/platform/linux-generic/include/api/odp/atomic.h
index e45a751b2..ab424c096 100644
--- a/platform/linux-generic/include/api/odp_atomic.h
+++ b/platform/linux-generic/include/api/odp/atomic.h
@@ -19,7 +19,7 @@ extern "C" {
 #endif
 
 #include <stdint.h>
-#include <odp_align.h>
+#include <odp/align.h>
 
 /** @addtogroup odp_synchronizers
  *  Atomic types and relaxed operations. These operations cannot be used for
diff --git a/platform/linux-generic/include/api/odp_barrier.h b/platform/linux-generic/include/api/odp/barrier.h
index 423982f3c..9ba54c3e2 100644
--- a/platform/linux-generic/include/api/odp_barrier.h
+++ b/platform/linux-generic/include/api/odp/barrier.h
@@ -19,8 +19,8 @@ extern "C" {
 #endif
 
 
-#include <odp_std_types.h>
-#include <odp_atomic.h>
+#include <odp/std_types.h>
+#include <odp/atomic.h>
 
 /** @addtogroup odp_synchronizers
  *  Synchronize threads.
diff --git a/platform/linux-generic/include/api/odp_buffer.h b/platform/linux-generic/include/api/odp/buffer.h
index 8e144b8d9..41d48a183 100644
--- a/platform/linux-generic/include/api/odp_buffer.h
+++ b/platform/linux-generic/include/api/odp/buffer.h
@@ -19,9 +19,9 @@ extern "C" {
 #endif
 
 
-#include <odp_std_types.h>
-#include <odp_platform_types.h>
-#include <odp_event.h>
+#include <odp/std_types.h>
+#include <odp/platform_types.h>
+#include <odp/event.h>
 
 /** @defgroup odp_buffer ODP BUFFER
  *  Operations on a buffer.
diff --git a/platform/linux-generic/include/api/odp_byteorder.h b/platform/linux-generic/include/api/odp/byteorder.h
index 589001102..f2633c243 100644
--- a/platform/linux-generic/include/api/odp_byteorder.h
+++ b/platform/linux-generic/include/api/odp/byteorder.h
@@ -20,8 +20,8 @@ extern "C" {
 
 #include <endian.h>
 #include <asm/byteorder.h>
-#include <odp_std_types.h>
-#include <odp_compiler.h>
+#include <odp/std_types.h>
+#include <odp/compiler.h>
 
 /** @defgroup odp_compiler_optim ODP COMPILER / OPTIMIZATION
  *  Macros that check byte order and byte converting operations.
diff --git a/platform/linux-generic/include/api/odp_classification.h b/platform/linux-generic/include/api/odp/classification.h
index 5b2108a3a..8a5c82e3b 100644
--- a/platform/linux-generic/include/api/odp_classification.h
+++ b/platform/linux-generic/include/api/odp/classification.h
@@ -19,10 +19,10 @@ extern "C" {
 #endif
 
 
-#include <odp_std_types.h>
-#include <odp_pool.h>
-#include <odp_packet.h>
-#include <odp_queue.h>
+#include <odp/std_types.h>
+#include <odp/pool.h>
+#include <odp/packet.h>
+#include <odp/queue.h>
 
 /** @defgroup odp_classification ODP CLASSIFICATION
  *  Classification operations.
diff --git a/platform/linux-generic/include/api/odp_compiler.h b/platform/linux-generic/include/api/odp/compiler.h
index 71a44317a..71a44317a 100644
--- a/platform/linux-generic/include/api/odp_compiler.h
+++ b/platform/linux-generic/include/api/odp/compiler.h
diff --git a/platform/linux-generic/include/api/odp_config.h b/platform/linux-generic/include/api/odp/config.h
index 3529fcad2..3529fcad2 100644
--- a/platform/linux-generic/include/api/odp_config.h
+++ b/platform/linux-generic/include/api/odp/config.h
diff --git a/platform/linux-generic/include/api/odp_cpumask.h b/platform/linux-generic/include/api/odp/cpumask.h
index b746a4da0..9e970b666 100644
--- a/platform/linux-generic/include/api/odp_cpumask.h
+++ b/platform/linux-generic/include/api/odp/cpumask.h
@@ -21,7 +21,7 @@ extern "C" {
 #include <string.h>
 #include <sched.h>
 
-#include <odp_std_types.h>
+#include <odp/std_types.h>
 
 /** @addtogroup odp_scheduler
  *  CPU mask operations.
diff --git a/platform/linux-generic/include/api/odp_crypto.h b/platform/linux-generic/include/api/odp/crypto.h
index da6041c94..75c795e96 100644
--- a/platform/linux-generic/include/api/odp_crypto.h
+++ b/platform/linux-generic/include/api/odp/crypto.h
@@ -18,11 +18,11 @@
 extern "C" {
 #endif
 
-#include <odp_std_types.h>
-#include <odp_event.h>
-#include <odp_pool.h>
-#include <odp_queue.h>
-#include <odp_packet.h>
+#include <odp/std_types.h>
+#include <odp/event.h>
+#include <odp/pool.h>
+#include <odp/queue.h>
+#include <odp/packet.h>
 
 /** @defgroup odp_crypto ODP CRYPTO
  *  Macros, enums, types and operations to utilise crypto.
diff --git a/platform/linux-generic/include/api/odp_debug.h b/platform/linux-generic/include/api/odp/debug.h
index ce07e85bb..05f4e9e9d 100644
--- a/platform/linux-generic/include/api/odp_debug.h
+++ b/platform/linux-generic/include/api/odp/debug.h
@@ -31,8 +31,8 @@ extern "C" {
  * _Static_assert was only added in GCC 4.6. Provide a weak replacement
  * for previous versions.
  */
-#define _Static_assert(e, s) extern int (*static_assert_checker (void)) \
-	[sizeof (struct { unsigned int error_if_negative: (e) ? 1 : -1; })]
+#define _Static_assert(e, s) (extern int (*static_assert_checker(void)) \
+	[sizeof(struct { unsigned int error_if_negative:(e) ? 1 : -1; })])
 
 #endif
 
diff --git a/platform/linux-generic/include/api/odp_event.h b/platform/linux-generic/include/api/odp/event.h
index 209d9683b..66843f7b9 100644
--- a/platform/linux-generic/include/api/odp_event.h
+++ b/platform/linux-generic/include/api/odp/event.h
@@ -19,8 +19,8 @@ extern "C" {
 #endif
 
 
-#include <odp_std_types.h>
-#include <odp_platform_types.h>
+#include <odp/std_types.h>
+#include <odp/platform_types.h>
 
 /** @defgroup odp_event ODP EVENT
  *  Operations on an event.
diff --git a/platform/linux-generic/include/api/odp_hints.h b/platform/linux-generic/include/api/odp/hints.h
index 7f048860a..7f048860a 100644
--- a/platform/linux-generic/include/api/odp_hints.h
+++ b/platform/linux-generic/include/api/odp/hints.h
diff --git a/platform/linux-generic/include/api/odp_init.h b/platform/linux-generic/include/api/odp/init.h
index ac856df6d..c73b32108 100644
--- a/platform/linux-generic/include/api/odp_init.h
+++ b/platform/linux-generic/include/api/odp/init.h
@@ -28,7 +28,7 @@ extern "C" {
 
 
 
-#include <odp_std_types.h>
+#include <odp/std_types.h>
 
 /** @defgroup odp_initialization ODP INITIALIZATION
  *  Initialisation operations.
diff --git a/platform/linux-generic/include/api/odp_packet.h b/platform/linux-generic/include/api/odp/packet.h
index eca5b73f7..1d0de8c37 100644
--- a/platform/linux-generic/include/api/odp_packet.h
+++ b/platform/linux-generic/include/api/odp/packet.h
@@ -18,8 +18,8 @@
 extern "C" {
 #endif
 
-#include <odp_buffer.h>
-#include <odp_platform_types.h>
+#include <odp/buffer.h>
+#include <odp/platform_types.h>
 
 /** @defgroup odp_packet ODP PACKET
  *  Operations on a packet.
diff --git a/platform/linux-generic/include/api/odp_packet_flags.h b/platform/linux-generic/include/api/odp/packet_flags.h
index 24c4065f0..0e47bdcce 100644
--- a/platform/linux-generic/include/api/odp_packet_flags.h
+++ b/platform/linux-generic/include/api/odp/packet_flags.h
@@ -18,8 +18,8 @@
 extern "C" {
 #endif
 
-#include <odp_std_types.h>
-#include <odp_packet.h>
+#include <odp/std_types.h>
+#include <odp/packet.h>
 
 /** @addtogroup odp_packet
  *  Boolean operations on a packet.
diff --git a/platform/linux-generic/include/api/odp_packet_io.h b/platform/linux-generic/include/api/odp/packet_io.h
index 6e479aad4..0ee56b7e8 100644
--- a/platform/linux-generic/include/api/odp_packet_io.h
+++ b/platform/linux-generic/include/api/odp/packet_io.h
@@ -18,11 +18,11 @@
 extern "C" {
 #endif
 
-#include <odp_std_types.h>
-#include <odp_platform_types.h>
-#include <odp_pool.h>
-#include <odp_packet.h>
-#include <odp_queue.h>
+#include <odp/std_types.h>
+#include <odp/platform_types.h>
+#include <odp/pool.h>
+#include <odp/packet.h>
+#include <odp/queue.h>
 
 /** @defgroup odp_packet_io ODP PACKET IO
  *  Operations on a packet.
diff --git a/platform/linux-generic/include/api/odp_platform_types.h b/platform/linux-generic/include/api/odp/platform_types.h
index 962ed4c5c..962ed4c5c 100644
--- a/platform/linux-generic/include/api/odp_platform_types.h
+++ b/platform/linux-generic/include/api/odp/platform_types.h
diff --git a/platform/linux-generic/include/api/odp_pool.h b/platform/linux-generic/include/api/odp/pool.h
index 174bb062e..19efb5940 100644
--- a/platform/linux-generic/include/api/odp_pool.h
+++ b/platform/linux-generic/include/api/odp/pool.h
@@ -20,10 +20,10 @@ extern "C" {
 
 
 
-#include <odp_std_types.h>
-#include <odp_platform_types.h>
-#include <odp_buffer.h>
-#include <odp_event.h>
+#include <odp/std_types.h>
+#include <odp/platform_types.h>
+#include <odp/buffer.h>
+#include <odp/event.h>
 
 /** @addtogroup odp_buffer
  *  Operations on a pool.
diff --git a/platform/linux-generic/include/api/odp_queue.h b/platform/linux-generic/include/api/odp/queue.h
index fceed4d49..9311eb419 100644
--- a/platform/linux-generic/include/api/odp_queue.h
+++ b/platform/linux-generic/include/api/odp/queue.h
@@ -19,8 +19,8 @@ extern "C" {
 #endif
 
 
-#include <odp_std_types.h>
-#include <odp_platform_types.h>
+#include <odp/std_types.h>
+#include <odp/platform_types.h>
 
 /** @defgroup odp_queue ODP QUEUE
  *  Macros and operation on a queue.
diff --git a/platform/linux-generic/include/api/odp_rwlock.h b/platform/linux-generic/include/api/odp/rwlock.h
index 1295e3179..f9d418ea2 100644
--- a/platform/linux-generic/include/api/odp_rwlock.h
+++ b/platform/linux-generic/include/api/odp/rwlock.h
@@ -13,7 +13,7 @@
  * ODP RW Locks
  */
 
-#include <odp_atomic.h>
+#include <odp/atomic.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/platform/linux-generic/include/api/odp_schedule.h b/platform/linux-generic/include/api/odp/schedule.h
index 688a6db37..8045c803c 100644
--- a/platform/linux-generic/include/api/odp_schedule.h
+++ b/platform/linux-generic/include/api/odp/schedule.h
@@ -19,9 +19,9 @@ extern "C" {
 #endif
 
 
-#include <odp_std_types.h>
-#include <odp_buffer.h>
-#include <odp_queue.h>
+#include <odp/std_types.h>
+#include <odp/buffer.h>
+#include <odp/queue.h>
 
 /** @defgroup odp_scheduler ODP SCHEDULER
  *  Operations on the scheduler.
diff --git a/platform/linux-generic/include/api/odp_shared_memory.h b/platform/linux-generic/include/api/odp/shared_memory.h
index f70db5a62..222fcd35f 100644
--- a/platform/linux-generic/include/api/odp_shared_memory.h
+++ b/platform/linux-generic/include/api/odp/shared_memory.h
@@ -19,8 +19,8 @@ extern "C" {
 #endif
 
 
-#include <odp_std_types.h>
-#include <odp_platform_types.h>
+#include <odp/std_types.h>
+#include <odp/platform_types.h>
 
 /** @defgroup odp_shared_memory ODP SHARED MEMORY
  *  Operations on shared memory.
diff --git a/platform/linux-generic/include/api/odp_spinlock.h b/platform/linux-generic/include/api/odp/spinlock.h
index 806cc05c6..504e629e2 100644
--- a/platform/linux-generic/include/api/odp_spinlock.h
+++ b/platform/linux-generic/include/api/odp/spinlock.h
@@ -19,7 +19,7 @@ extern "C" {
 #endif
 
 
-#include <odp_std_types.h>
+#include <odp/std_types.h>
 
 /** @addtogroup odp_synchronizers
  *  Operations on spin locks.
diff --git a/platform/linux-generic/include/api/odp_std_types.h b/platform/linux-generic/include/api/odp/std_types.h
index 61255a6d1..61255a6d1 100644
--- a/platform/linux-generic/include/api/odp_std_types.h
+++ b/platform/linux-generic/include/api/odp/std_types.h
diff --git a/platform/linux-generic/include/api/odp_sync.h b/platform/linux-generic/include/api/odp/sync.h
index d9daadad0..d9daadad0 100644
--- a/platform/linux-generic/include/api/odp_sync.h
+++ b/platform/linux-generic/include/api/odp/sync.h
diff --git a/platform/linux-generic/include/api/odp_system_info.h b/platform/linux-generic/include/api/odp/system_info.h
index 42ab05464..01431a45a 100644
--- a/platform/linux-generic/include/api/odp_system_info.h
+++ b/platform/linux-generic/include/api/odp/system_info.h
@@ -19,7 +19,7 @@ extern "C" {
 #endif
 
 
-#include <odp_std_types.h>
+#include <odp/std_types.h>
 
 /** @addtogroup odp_ver_abt_log_dbg
  *  @{
diff --git a/platform/linux-generic/include/api/odp_thread.h b/platform/linux-generic/include/api/odp/thread.h
index 469d29864..469d29864 100644
--- a/platform/linux-generic/include/api/odp_thread.h
+++ b/platform/linux-generic/include/api/odp/thread.h
diff --git a/platform/linux-generic/include/api/odp_ticketlock.h b/platform/linux-generic/include/api/odp/ticketlock.h
index 93a66b7b9..2116e3ead 100644
--- a/platform/linux-generic/include/api/odp_ticketlock.h
+++ b/platform/linux-generic/include/api/odp/ticketlock.h
@@ -19,8 +19,8 @@ extern "C" {
 #endif
 
 
-#include <odp_std_types.h>
-#include <odp_atomic.h>
+#include <odp/std_types.h>
+#include <odp/atomic.h>
 
 /** @addtogroup odp_synchronizers
  * Operations on ticket locks.
diff --git a/platform/linux-generic/include/api/odp_time.h b/platform/linux-generic/include/api/odp/time.h
index 4f510708d..58b20f548 100644
--- a/platform/linux-generic/include/api/odp_time.h
+++ b/platform/linux-generic/include/api/odp/time.h
@@ -19,7 +19,7 @@ extern "C" {
 #endif
 
 
-#include <odp_std_types.h>
+#include <odp/std_types.h>
 
 /** @defgroup odp_system ODP SYSTEM
  *  @{
diff --git a/platform/linux-generic/include/api/odp_timer.h b/platform/linux-generic/include/api/odp/timer.h
index b90473849..357771b92 100644
--- a/platform/linux-generic/include/api/odp_timer.h
+++ b/platform/linux-generic/include/api/odp/timer.h
@@ -19,9 +19,9 @@ extern "C" {
 #endif
 
 #include <stdlib.h>
-#include <odp_std_types.h>
-#include <odp_event.h>
-#include <odp_queue.h>
+#include <odp/std_types.h>
+#include <odp/event.h>
+#include <odp/queue.h>
 
 /** @defgroup odp_timer ODP TIMER
  *  @{
diff --git a/platform/linux-generic/include/api/odp_version.h b/platform/linux-generic/include/api/odp/version.h
index 69be81c5a..69be81c5a 100644
--- a/platform/linux-generic/include/api/odp_version.h
+++ b/platform/linux-generic/include/api/odp/version.h
diff --git a/platform/linux-generic/include/odp_align_internal.h b/platform/linux-generic/include/odp_align_internal.h
index b734cc560..14b79d003 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/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 a02ecc555..06fc16b1b 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/std_types.h>
+#include <odp/align.h>
+#include <odp/hints.h>
+#include <odp/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 5a4265328..46802e67f 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/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_align_internal.h>
-#include <odp_config.h>
-#include <odp_byteorder.h>
-#include <odp_thread.h>
-#include <odp_event.h>
+#include <odp/config.h>
+#include <odp/byteorder.h>
+#include <odp/thread.h>
+#include <odp/event.h>
 
 
 #define ODP_BITSIZE(x) \
diff --git a/platform/linux-generic/include/odp_buffer_pool_internal.h b/platform/linux-generic/include/odp_buffer_pool_internal.h
index d6f44d914..e02e35a0b 100644
--- a/platform/linux-generic/include/odp_buffer_pool_internal.h
+++ b/platform/linux-generic/include/odp_buffer_pool_internal.h
@@ -18,16 +18,16 @@
 extern "C" {
 #endif
 
-#include <odp_std_types.h>
-#include <odp_align.h>
+#include <odp/std_types.h>
+#include <odp/align.h>
 #include <odp_align_internal.h>
-#include <odp_pool.h>
+#include <odp/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/hints.h>
+#include <odp/config.h>
+#include <odp/debug.h>
+#include <odp/shared_memory.h>
+#include <odp/atomic.h>
 #include <odp_atomic_internal.h>
 #include <string.h>
 
@@ -66,12 +66,12 @@ typedef struct local_cache_t {
 
 
 #ifdef POOL_USE_TICKETLOCK
-#include <odp_ticketlock.h>
+#include <odp/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/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_classification_datamodel.h b/platform/linux-generic/include/odp_classification_datamodel.h
index 18846bc2e..3b42e9903 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/spinlock.h>
+#include <odp/classification.h>
 #include <odp_buffer_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 6b2011972..05f603da3 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/debug.h>
 #include <odph_eth.h>
 #include <odph_ip.h>
 #include <odph_udp.h>
diff --git a/platform/linux-generic/include/odp_classification_internal.h b/platform/linux-generic/include/odp_classification_internal.h
index fd2c6afbb..55932802c 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/classification.h>
+#include <odp/queue.h>
 #include <odp_packet_internal.h>
-#include <odp_packet_io.h>
+#include <odp/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 0b64fca73..a665644eb 100644
--- a/platform/linux-generic/include/odp_debug_internal.h
+++ b/platform/linux-generic/include/odp_debug_internal.h
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include <odp_debug.h>
+#include <odp/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 07c9f60d2..608aafd60 100644
--- a/platform/linux-generic/include/odp_internal.h
+++ b/platform/linux-generic/include/odp_internal.h
@@ -18,7 +18,7 @@
 extern "C" {
 #endif
 
-#include <odp_init.h>
+#include <odp/init.h>
 
 struct odp_global_data {
 	odp_log_func_t log_fn;
diff --git a/platform/linux-generic/include/odp_packet_internal.h b/platform/linux-generic/include/odp_packet_internal.h
index 0ebc14b38..e9ce4524c 100644
--- a/platform/linux-generic/include/odp_packet_internal.h
+++ b/platform/linux-generic/include/odp_packet_internal.h
@@ -18,13 +18,13 @@
 extern "C" {
 #endif
 
-#include <odp_align.h>
-#include <odp_debug.h>
+#include <odp/align.h>
+#include <odp/debug.h>
 #include <odp_buffer_internal.h>
 #include <odp_buffer_pool_internal.h>
 #include <odp_buffer_inlines.h>
-#include <odp_packet.h>
-#include <odp_packet_io.h>
+#include <odp/packet.h>
+#include <odp/packet_io.h>
 
 /**
  * Packet input & protocol flags
diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h
index 1b5641f7b..488818ce2 100644
--- a/platform/linux-generic/include/odp_packet_io_internal.h
+++ b/platform/linux-generic/include/odp_packet_io_internal.h
@@ -18,13 +18,13 @@
 extern "C" {
 #endif
 
-#include <odp_spinlock.h>
+#include <odp/spinlock.h>
 #include <odp_packet_socket.h>
 #include <odp_classification_datamodel.h>
 #include <odp_align_internal.h>
 
-#include <odp_config.h>
-#include <odp_hints.h>
+#include <odp/config.h>
+#include <odp/hints.h>
 #include <linux/if.h>
 
 /**
diff --git a/platform/linux-generic/include/odp_packet_socket.h b/platform/linux-generic/include/odp_packet_socket.h
index 08c7cb6ef..098d58d4f 100644
--- a/platform/linux-generic/include/odp_packet_socket.h
+++ b/platform/linux-generic/include/odp_packet_socket.h
@@ -12,11 +12,11 @@
 #include <linux/if_ether.h>
 #include <sys/socket.h>
 
-#include <odp_align.h>
-#include <odp_buffer.h>
-#include <odp_debug.h>
-#include <odp_pool.h>
-#include <odp_packet.h>
+#include <odp/align.h>
+#include <odp/buffer.h>
+#include <odp/debug.h>
+#include <odp/pool.h>
+#include <odp/packet.h>
 
 #include <linux/version.h>
 
diff --git a/platform/linux-generic/include/odp_queue_internal.h b/platform/linux-generic/include/odp_queue_internal.h
index dbc42c045..340e20dea 100644
--- a/platform/linux-generic/include/odp_queue_internal.h
+++ b/platform/linux-generic/include/odp_queue_internal.h
@@ -18,19 +18,19 @@
 extern "C" {
 #endif
 
-#include <odp_queue.h>
+#include <odp/queue.h>
 #include <odp_buffer_internal.h>
 #include <odp_align_internal.h>
-#include <odp_packet_io.h>
-#include <odp_align.h>
+#include <odp/packet_io.h>
+#include <odp/align.h>
 
 
 #define USE_TICKETLOCK
 
 #ifdef USE_TICKETLOCK
-#include <odp_ticketlock.h>
+#include <odp/ticketlock.h>
 #else
-#include <odp_spinlock.h>
+#include <odp/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 7b943bdc9..acda2e4c7 100644
--- a/platform/linux-generic/include/odp_schedule_internal.h
+++ b/platform/linux-generic/include/odp_schedule_internal.h
@@ -14,8 +14,8 @@ extern "C" {
 #endif
 
 
-#include <odp_buffer.h>
-#include <odp_queue.h>
+#include <odp/buffer.h>
+#include <odp/queue.h>
 
 void odp_schedule_mask_set(odp_queue_t queue, int prio);
 
diff --git a/platform/linux-generic/include/odp_timer_internal.h b/platform/linux-generic/include/odp_timer_internal.h
index ed5ee7e7d..588eb6b41 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/align.h>
+#include <odp/debug.h>
 #include <odp_buffer_internal.h>
 #include <odp_buffer_pool_internal.h>
-#include <odp_timer.h>
+#include <odp/timer.h>
 
 /**
  * Internal Timeout header
diff --git a/platform/linux-generic/odp_barrier.c b/platform/linux-generic/odp_barrier.c
index c1a01d855..53d83c0dd 100644
--- a/platform/linux-generic/odp_barrier.c
+++ b/platform/linux-generic/odp_barrier.c
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp_barrier.h>
-#include <odp_sync.h>
+#include <odp/barrier.h>
+#include <odp/sync.h>
 #include <odp_spin_internal.h>
 #include <odp_atomic_internal.h>
 
diff --git a/platform/linux-generic/odp_buffer.c b/platform/linux-generic/odp_buffer.c
index e657e0098..20906a74b 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/buffer.h>
 #include <odp_buffer_pool_internal.h>
 #include <odp_buffer_internal.h>
 #include <odp_buffer_inlines.h>
diff --git a/platform/linux-generic/odp_buffer_pool.c b/platform/linux-generic/odp_buffer_pool.c
index ac1205711..3e13e6f46 100644
--- a/platform/linux-generic/odp_buffer_pool.c
+++ b/platform/linux-generic/odp_buffer_pool.c
@@ -4,19 +4,19 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp_std_types.h>
-#include <odp_pool.h>
+#include <odp/std_types.h>
+#include <odp/pool.h>
 #include <odp_buffer_internal.h>
 #include <odp_buffer_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/shared_memory.h>
+#include <odp/align.h>
 #include <odp_internal.h>
-#include <odp_config.h>
-#include <odp_hints.h>
+#include <odp/config.h>
+#include <odp/hints.h>
 #include <odp_debug_internal.h>
 #include <odp_atomic_internal.h>
 
diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c
index 0f5883610..55c3e4e74 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/classification.h>
+#include <odp/align.h>
+#include <odp/queue.h>
+#include <odp/debug.h>
 #include <odp_internal.h>
 #include <odp_debug_internal.h>
 #include <odp_packet_internal.h>
-#include <odp_packet_io.h>
+#include <odp/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_buffer_pool_internal.h>
-#include <odp_shared_memory.h>
+#include <odp/shared_memory.h>
 #include <odph_eth.h>
 #include <string.h>
-#include <odp_spinlock.h>
+#include <odp/spinlock.h>
 
 #define LOCK(a)      odp_spinlock_lock(a)
 #define UNLOCK(a)    odp_spinlock_unlock(a)
diff --git a/platform/linux-generic/odp_cpumask.c b/platform/linux-generic/odp_cpumask.c
index d9931b455..6088ca2c6 100644
--- a/platform/linux-generic/odp_cpumask.c
+++ b/platform/linux-generic/odp_cpumask.c
@@ -9,7 +9,7 @@
 #endif
 #include <sched.h>
 
-#include <odp_cpumask.h>
+#include <odp/cpumask.h>
 #include <odp_debug_internal.h>
 
 #include <stdlib.h>
diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c
index 4436a0c4b..483925b65 100644
--- a/platform/linux-generic/odp_crypto.c
+++ b/platform/linux-generic/odp_crypto.c
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp_crypto.h>
+#include <odp/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/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_crypto_internal.h>
 #include <odp_debug_internal.h>
-#include <odp_hints.h>
+#include <odp/hints.h>
 #include <odp_packet_internal.h>
 
 #include <string.h>
diff --git a/platform/linux-generic/odp_event.c b/platform/linux-generic/odp_event.c
index c4291f846..17f4f431f 100644
--- a/platform/linux-generic/odp_event.c
+++ b/platform/linux-generic/odp_event.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp_event.h>
-#include <odp_buffer.h>
-#include <odp_pool.h>
+#include <odp/event.h>
+#include <odp/buffer.h>
+#include <odp/pool.h>
 #include <odp_buffer_internal.h>
 
 int odp_event_type(odp_event_t event)
diff --git a/platform/linux-generic/odp_impl.c b/platform/linux-generic/odp_impl.c
index 3453ddb29..ca3224d1b 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/version.h>
 
 #define  ODP_VERSION_IMPL 0
 #define  ODP_VERSION_IMPL_STR ODP_VERSION_TO_STR(ODP_VERSION_IMPL)
diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c
index 9815ecffb..6db05b34b 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/init.h>
 #include <odp_internal.h>
-#include <odp_debug.h>
+#include <odp/debug.h>
 #include <odp_debug_internal.h>
 
 
diff --git a/platform/linux-generic/odp_linux.c b/platform/linux-generic/odp_linux.c
index 84fee5975..a813ed1ba 100644
--- a/platform/linux-generic/odp_linux.c
+++ b/platform/linux-generic/odp_linux.c
@@ -20,9 +20,9 @@
 
 #include <odph_linux.h>
 #include <odp_internal.h>
-#include <odp_thread.h>
-#include <odp_init.h>
-#include <odp_system_info.h>
+#include <odp/thread.h>
+#include <odp/init.h>
+#include <odp/system_info.h>
 #include <odp_debug_internal.h>
 
 #define MAX_WORKERS 32
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index bb049d1cd..a8a84becf 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/packet.h>
 #include <odp_packet_internal.h>
 #include <odp_debug_internal.h>
-#include <odp_hints.h>
-#include <odp_byteorder.h>
+#include <odp/hints.h>
+#include <odp/byteorder.h>
 
 #include <odph_eth.h>
 #include <odph_ip.h>
diff --git a/platform/linux-generic/odp_packet_flags.c b/platform/linux-generic/odp_packet_flags.c
index 3f0ea9f84..ec9bc09c5 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/packet_flags.h>
 #include <odp_packet_internal.h>
 
 
diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c
index 52125fcd2..bdb690eca 100644
--- a/platform/linux-generic/odp_packet_io.c
+++ b/platform/linux-generic/odp_packet_io.c
@@ -4,16 +4,16 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp_packet_io.h>
+#include <odp/packet_io.h>
 #include <odp_packet_io_internal.h>
 #include <odp_packet_io_queue.h>
-#include <odp_packet.h>
+#include <odp/packet.h>
 #include <odp_packet_internal.h>
 #include <odp_internal.h>
-#include <odp_spinlock.h>
-#include <odp_shared_memory.h>
+#include <odp/spinlock.h>
+#include <odp/shared_memory.h>
 #include <odp_packet_socket.h>
-#include <odp_config.h>
+#include <odp/config.h>
 #include <odp_queue_internal.h>
 #include <odp_schedule_internal.h>
 #include <odp_classification_internal.h>
diff --git a/platform/linux-generic/odp_packet_socket.c b/platform/linux-generic/odp_packet_socket.c
index bf69511e0..b7441d5d7 100644
--- a/platform/linux-generic/odp_packet_socket.c
+++ b/platform/linux-generic/odp_packet_socket.c
@@ -39,7 +39,7 @@
 #include <odp_packet_internal.h>
 #include <odp_align_internal.h>
 #include <odp_debug_internal.h>
-#include <odp_hints.h>
+#include <odp/hints.h>
 
 #include <odph_eth.h>
 #include <odph_ip.h>
diff --git a/platform/linux-generic/odp_queue.c b/platform/linux-generic/odp_queue.c
index 17ff7c1aa..60be9c21e 100644
--- a/platform/linux-generic/odp_queue.c
+++ b/platform/linux-generic/odp_queue.c
@@ -4,31 +4,31 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp_queue.h>
+#include <odp/queue.h>
 #include <odp_queue_internal.h>
-#include <odp_std_types.h>
-#include <odp_align.h>
-#include <odp_buffer.h>
+#include <odp/std_types.h>
+#include <odp/align.h>
+#include <odp/buffer.h>
 #include <odp_buffer_internal.h>
 #include <odp_buffer_pool_internal.h>
 #include <odp_buffer_inlines.h>
 #include <odp_internal.h>
-#include <odp_shared_memory.h>
+#include <odp/shared_memory.h>
 #include <odp_schedule_internal.h>
-#include <odp_config.h>
+#include <odp/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/hints.h>
+#include <odp/sync.h>
 
 #ifdef USE_TICKETLOCK
-#include <odp_ticketlock.h>
+#include <odp/ticketlock.h>
 #define LOCK(a)      odp_ticketlock_lock(a)
 #define UNLOCK(a)    odp_ticketlock_unlock(a)
 #define LOCK_INIT(a) odp_ticketlock_init(a)
 #else
-#include <odp_spinlock.h>
+#include <odp/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_ring.c b/platform/linux-generic/odp_ring.c
index 03f01d54e..607a8cd45 100644
--- a/platform/linux-generic/odp_ring.c
+++ b/platform/linux-generic/odp_ring.c
@@ -69,18 +69,18 @@
  *
  ***************************************************************************/
 
-#include <odp_shared_memory.h>
+#include <odp/shared_memory.h>
 #include <odp_internal.h>
 #include <odp_spin_internal.h>
 #include <odp_align_internal.h>
-#include <odp_spinlock.h>
-#include <odp_align.h>
+#include <odp/spinlock.h>
+#include <odp/align.h>
 #include <sys/mman.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
 #include <odp_debug_internal.h>
-#include <odp_rwlock.h>
+#include <odp/rwlock.h>
 #include <odph_ring.h>
 
 static TAILQ_HEAD(, odph_ring) odp_ring_list;
diff --git a/platform/linux-generic/odp_rwlock.c b/platform/linux-generic/odp_rwlock.c
index 01a3b4ef5..e67169ee9 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/atomic.h>
 #include <odp_atomic_internal.h>
-#include <odp_rwlock.h>
+#include <odp/rwlock.h>
 
 #include <odp_spin_internal.h>
 
diff --git a/platform/linux-generic/odp_schedule.c b/platform/linux-generic/odp_schedule.c
index 58561a99c..999c80060 100644
--- a/platform/linux-generic/odp_schedule.c
+++ b/platform/linux-generic/odp_schedule.c
@@ -4,20 +4,20 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp_schedule.h>
+#include <odp/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/align.h>
+#include <odp/queue.h>
+#include <odp/shared_memory.h>
+#include <odp/buffer.h>
+#include <odp/pool.h>
 #include <odp_internal.h>
-#include <odp_config.h>
+#include <odp/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/thread.h>
+#include <odp/time.h>
+#include <odp/spinlock.h>
+#include <odp/hints.h>
 
 #include <odp_queue_internal.h>
 
diff --git a/platform/linux-generic/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c
index 515a26f81..96d10e8fe 100644
--- a/platform/linux-generic/odp_shared_memory.c
+++ b/platform/linux-generic/odp_shared_memory.c
@@ -7,12 +7,12 @@
 /*ftruncate _POSIX_C_SOURCE 200809L */
 #define _POSIX_C_SOURCE 200809L
 
-#include <odp_shared_memory.h>
+#include <odp/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/spinlock.h>
+#include <odp/align.h>
+#include <odp/system_info.h>
+#include <odp/debug.h>
 #include <odp_debug_internal.h>
 #include <odp_align_internal.h>
 
diff --git a/platform/linux-generic/odp_spinlock.c b/platform/linux-generic/odp_spinlock.c
index 4dfd3cf85..f16572053 100644
--- a/platform/linux-generic/odp_spinlock.c
+++ b/platform/linux-generic/odp_spinlock.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp_spinlock.h>
+#include <odp/spinlock.h>
 #include <odp_atomic_internal.h>
 #include <odp_spin_internal.h>
 
diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c
index fddd19a30..d27c819b3 100644
--- a/platform/linux-generic/odp_system_info.c
+++ b/platform/linux-generic/odp_system_info.c
@@ -4,10 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp_system_info.h>
+#include <odp/system_info.h>
 #include <odp_internal.h>
 #include <odp_debug_internal.h>
-#include <odp_align.h>
+#include <odp/align.h>
 #include <string.h>
 #include <stdio.h>
 
diff --git a/platform/linux-generic/odp_thread.c b/platform/linux-generic/odp_thread.c
index ccbd0685b..e66b8c1cc 100644
--- a/platform/linux-generic/odp_thread.c
+++ b/platform/linux-generic/odp_thread.c
@@ -9,13 +9,13 @@
 #endif
 #include <sched.h>
 
-#include <odp_thread.h>
+#include <odp/thread.h>
 #include <odp_internal.h>
-#include <odp_atomic.h>
-#include <odp_config.h>
+#include <odp/atomic.h>
+#include <odp/config.h>
 #include <odp_debug_internal.h>
-#include <odp_shared_memory.h>
-#include <odp_align.h>
+#include <odp/shared_memory.h>
+#include <odp/align.h>
 
 #include <string.h>
 #include <stdio.h>
diff --git a/platform/linux-generic/odp_ticketlock.c b/platform/linux-generic/odp_ticketlock.c
index 652578629..3e2a4ece1 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/ticketlock.h>
+#include <odp/atomic.h>
 #include <odp_atomic_internal.h>
-#include <odp_sync.h>
+#include <odp/sync.h>
 #include <odp_spin_internal.h>
 
 
diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c
index c97c3deb7..0098af65b 100644
--- a/platform/linux-generic/odp_time.c
+++ b/platform/linux-generic/odp_time.c
@@ -4,9 +4,9 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp_time.h>
-#include <odp_hints.h>
-#include <odp_system_info.h>
+#include <odp/time.h>
+#include <odp/hints.h>
+#include <odp/system_info.h>
 
 #define GIGA 1000000000
 
diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c
index 11fc69e3e..0b2e675c8 100644
--- a/platform/linux-generic/odp_timer.c
+++ b/platform/linux-generic/odp_timer.c
@@ -29,27 +29,27 @@
 #include <stdlib.h>
 #include <time.h>
 #include <signal.h>
-#include <odp_align.h>
+#include <odp/align.h>
 #include <odp_align_internal.h>
-#include <odp_atomic.h>
+#include <odp/atomic.h>
 #include <odp_atomic_internal.h>
-#include <odp_buffer.h>
+#include <odp/buffer.h>
 #include <odp_buffer_inlines.h>
-#include <odp_pool.h>
+#include <odp/pool.h>
 #include <odp_buffer_pool_internal.h>
-#include <odp_debug.h>
+#include <odp/debug.h>
 #include <odp_debug_internal.h>
-#include <odp_event.h>
-#include <odp_hints.h>
+#include <odp/event.h>
+#include <odp/hints.h>
 #include <odp_internal.h>
-#include <odp_queue.h>
-#include <odp_shared_memory.h>
+#include <odp/queue.h>
+#include <odp/shared_memory.h>
 #include <odp_spin_internal.h>
-#include <odp_spinlock.h>
-#include <odp_std_types.h>
-#include <odp_sync.h>
-#include <odp_time.h>
-#include <odp_timer.h>
+#include <odp/spinlock.h>
+#include <odp/std_types.h>
+#include <odp/sync.h>
+#include <odp/time.h>
+#include <odp/timer.h>
 #include <odp_timer_internal.h>
 
 #define TMO_UNUSED   ((uint64_t)0xFFFFFFFFFFFFFFFF)
diff --git a/platform/linux-generic/odp_weak.c b/platform/linux-generic/odp_weak.c
index fccbc3fdb..2592fe95a 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/debug.h>
 #include <odp_debug_internal.h>
-#include <odp_hints.h>
+#include <odp/hints.h>
 
 ODP_WEAK_SYMBOL int odp_override_log(odp_log_level_e level ODP_UNUSED,
 				     const char *fmt, ...)