41 files changed, 19 insertions, 19 deletions
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