api: move include/odp.h to include/odp_api.h

odp.h actually describes the applicatiion interface of ODP and is
logicaly moved to odp_api.h.
Applications now includes <odp_api.h>.
This simplifies the addition of other ODP interfaces (e.g. drivers may
include odp_drv.h in the future.)

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>

88 files changed, 89 insertions, 89 deletions

diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c
index 6e9203986..b1608a886 100644
--- a/example/classifier/odp_classifier.c
+++ b/example/classifier/odp_classifier.c
@@ -10,7 +10,7 @@
 #include <unistd.h>
 #include <example_debug.h>
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp/helper/linux.h>
 #include <odp/helper/eth.h>
 #include <odp/helper/ip.h>
diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c
index 650007e22..0ba522438 100644
--- a/example/generator/odp_generator.c
+++ b/example/generator/odp_generator.c
@@ -17,7 +17,7 @@
 
 #include <example_debug.h>
 
-#include <odp.h>
+#include <odp_api.h>
 
 #include <odp/helper/linux.h>
 #include <odp/helper/eth.h>
diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c
index 6134ab6a4..e4b0a2264 100644
--- a/example/ipsec/odp_ipsec.c
+++ b/example/ipsec/odp_ipsec.c
@@ -21,7 +21,7 @@
 
 #include <example_debug.h>
 
-#include <odp.h>
+#include <odp_api.h>
 
 #include <odp/helper/linux.h>
 #include <odp/helper/eth.h>
diff --git a/example/ipsec/odp_ipsec_cache.c b/example/ipsec/odp_ipsec_cache.c
index 0883d4d4e..2bd44cf3e 100644
--- a/example/ipsec/odp_ipsec_cache.c
+++ b/example/ipsec/odp_ipsec_cache.c
@@ -9,7 +9,7 @@
 
 #include <example_debug.h>
 
-#include <odp.h>
+#include <odp_api.h>
 
 #include <odp/helper/ipsec.h>
 
diff --git a/example/ipsec/odp_ipsec_cache.h b/example/ipsec/odp_ipsec_cache.h
index 56be9d86b..7a4b95cd4 100644
--- a/example/ipsec/odp_ipsec_cache.h
+++ b/example/ipsec/odp_ipsec_cache.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp/helper/ipsec.h>
 
 #include <odp_ipsec_misc.h>
diff --git a/example/ipsec/odp_ipsec_fwd_db.c b/example/ipsec/odp_ipsec_fwd_db.c
index 59cb6e42d..38fc2833a 100644
--- a/example/ipsec/odp_ipsec_fwd_db.c
+++ b/example/ipsec/odp_ipsec_fwd_db.c
@@ -14,7 +14,7 @@
 
 #include <example_debug.h>
 
-#include <odp.h>
+#include <odp_api.h>
 
 #include <odp_ipsec_fwd_db.h>
 
diff --git a/example/ipsec/odp_ipsec_fwd_db.h b/example/ipsec/odp_ipsec_fwd_db.h
index 9d7aa094c..0e2e9edeb 100644
--- a/example/ipsec/odp_ipsec_fwd_db.h
+++ b/example/ipsec/odp_ipsec_fwd_db.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp/helper/eth.h>
 #include <odp_ipsec_misc.h>
 
diff --git a/example/ipsec/odp_ipsec_loop_db.c b/example/ipsec/odp_ipsec_loop_db.c
index ab0129bf4..1d5e404ee 100644
--- a/example/ipsec/odp_ipsec_loop_db.c
+++ b/example/ipsec/odp_ipsec_loop_db.c
@@ -9,7 +9,7 @@
 
 #include <example_debug.h>
 
-#include <odp.h>
+#include <odp_api.h>
 
 #include <odp_ipsec_loop_db.h>
 
diff --git a/example/ipsec/odp_ipsec_loop_db.h b/example/ipsec/odp_ipsec_loop_db.h
index 677f488d3..0778186fa 100644
--- a/example/ipsec/odp_ipsec_loop_db.h
+++ b/example/ipsec/odp_ipsec_loop_db.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp/helper/eth.h>
 #include <odp_ipsec_misc.h>
 
diff --git a/example/ipsec/odp_ipsec_misc.h b/example/ipsec/odp_ipsec_misc.h
index e583c01a1..6a49dcb66 100644
--- a/example/ipsec/odp_ipsec_misc.h
+++ b/example/ipsec/odp_ipsec_misc.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp/helper/eth.h>
 #include <odp/helper/ip.h>
 #include <odp/helper/ipsec.h>
diff --git a/example/ipsec/odp_ipsec_sa_db.c b/example/ipsec/odp_ipsec_sa_db.c
index 8b2d2121b..28215b5b7 100644
--- a/example/ipsec/odp_ipsec_sa_db.c
+++ b/example/ipsec/odp_ipsec_sa_db.c
@@ -14,7 +14,7 @@
 
 #include <example_debug.h>
 
-#include <odp.h>
+#include <odp_api.h>
 
 #include <odp_ipsec_sa_db.h>
 
diff --git a/example/ipsec/odp_ipsec_sp_db.c b/example/ipsec/odp_ipsec_sp_db.c
index 48874eb08..ed631c7ba 100644
--- a/example/ipsec/odp_ipsec_sp_db.c
+++ b/example/ipsec/odp_ipsec_sp_db.c
@@ -14,7 +14,7 @@
 
 #include <example_debug.h>
 
-#include <odp.h>
+#include <odp_api.h>
 
 #include <odp_ipsec_sp_db.h>
 
diff --git a/example/ipsec/odp_ipsec_stream.c b/example/ipsec/odp_ipsec_stream.c
index 69bb3c7cf..4dc9acfee 100644
--- a/example/ipsec/odp_ipsec_stream.c
+++ b/example/ipsec/odp_ipsec_stream.c
@@ -19,7 +19,7 @@
 
 #include <example_debug.h>
 
-#include <odp.h>
+#include <odp_api.h>
 
 #include <odp/helper/eth.h>
 #include <odp/helper/ip.h>
diff --git a/example/ipsec/odp_ipsec_stream.h b/example/ipsec/odp_ipsec_stream.h
index 12e368cf0..ea480c32d 100644
--- a/example/ipsec/odp_ipsec_stream.h
+++ b/example/ipsec/odp_ipsec_stream.h
@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_ipsec_misc.h>
 #include <odp_ipsec_cache.h>
 
diff --git a/example/packet/odp_pktio.c b/example/packet/odp_pktio.c
index adabc03b5..579f3fbdb 100644
--- a/example/packet/odp_pktio.c
+++ b/example/packet/odp_pktio.c
@@ -11,7 +11,7 @@
 
 #include <example_debug.h>
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp/helper/linux.h>
 #include <odp/helper/eth.h>
 #include <odp/helper/ip.h>
diff --git a/example/time/time_global_test.c b/example/time/time_global_test.c
index 7cfd96990..16dda4c32 100644
--- a/example/time/time_global_test.c
+++ b/example/time/time_global_test.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp.h>
+#include <odp_api.h>
 #include <example_debug.h>
 #include <odp/helper/linux.h>
 
diff --git a/example/timer/odp_timer_test.c b/example/timer/odp_timer_test.c
index e6717bf7b..4294376e0 100644
--- a/example/timer/odp_timer_test.c
+++ b/example/timer/odp_timer_test.c
@@ -10,7 +10,7 @@
 #include <example_debug.h>
 
 /* ODP main header */
-#include <odp.h>
+#include <odp_api.h>
 
 /* ODP helper for Linux apps */
 #include <odp/helper/linux.h>
diff --git a/example/traffic_mgmt/odp_traffic_mgmt.c b/example/traffic_mgmt/odp_traffic_mgmt.c
index b4f010152..d9769d350 100644
--- a/example/traffic_mgmt/odp_traffic_mgmt.c
+++ b/example/traffic_mgmt/odp_traffic_mgmt.c
@@ -15,7 +15,7 @@
 #include <signal.h>
 #include <sys/resource.h>
 #include <execinfo.h>
-#include <odp.h>
+#include <odp_api.h>
 #include <odp/api/plat/packet_types.h>
 #include <example_debug.h>
 
diff --git a/helper/hashtable.c b/helper/hashtable.c
index e0f562e5c..8bb1ae57c 100644
--- a/helper/hashtable.c
+++ b/helper/hashtable.c
@@ -10,7 +10,7 @@
 #include "odph_hashtable.h"
 #include "odph_list_internal.h"
 #include "odph_debug.h"
-#include <odp.h>
+#include <odp_api.h>
 
 #define    ODPH_SUCCESS	0
 #define    ODPH_FAIL	-1
diff --git a/helper/include/odp/helper/chksum.h b/helper/include/odp/helper/chksum.h
index 01dc47057..2f4b759ef 100644
--- a/helper/include/odp/helper/chksum.h
+++ b/helper/include/odp/helper/chksum.h
@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-#include <odp.h>
+#include <odp_api.h>
 
 /**
  * Checksum
diff --git a/helper/include/odp/helper/eth.h b/helper/include/odp/helper/eth.h
index 93841bba8..1e162257e 100644
--- a/helper/include/odp/helper/eth.h
+++ b/helper/include/odp/helper/eth.h
@@ -18,7 +18,7 @@
 extern "C" {
 #endif
 
-#include <odp.h>
+#include <odp_api.h>
 
 /** @addtogroup odph_header ODPH HEADER
  *  @{
diff --git a/helper/include/odp/helper/icmp.h b/helper/include/odp/helper/icmp.h
index b187c3a60..929b8bceb 100644
--- a/helper/include/odp/helper/icmp.h
+++ b/helper/include/odp/helper/icmp.h
@@ -18,7 +18,7 @@
 extern "C" {
 #endif
 
-#include <odp.h>
+#include <odp_api.h>
 
 /** @addtogroup odph_header ODPH HEADER
  *  @{
diff --git a/helper/include/odp/helper/ip.h b/helper/include/odp/helper/ip.h
index 616ccba52..3789d548e 100644
--- a/helper/include/odp/helper/ip.h
+++ b/helper/include/odp/helper/ip.h
@@ -18,7 +18,7 @@
 extern "C" {
 #endif
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp/helper/chksum.h>
 
 #include <string.h>
diff --git a/helper/include/odp/helper/ipsec.h b/helper/include/odp/helper/ipsec.h
index 80d900ccb..af3de87b8 100644
--- a/helper/include/odp/helper/ipsec.h
+++ b/helper/include/odp/helper/ipsec.h
@@ -18,7 +18,7 @@
 extern "C" {
 #endif
 
-#include <odp.h>
+#include <odp_api.h>
 
 /** @addtogroup odph_header ODPH HEADER
  *  @{
diff --git a/helper/include/odp/helper/linux.h b/helper/include/odp/helper/linux.h
index d38d5908d..d2799ad9c 100644
--- a/helper/include/odp/helper/linux.h
+++ b/helper/include/odp/helper/linux.h
@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-#include <odp.h>
+#include <odp_api.h>
 
 #include <pthread.h>
 #include <sys/types.h>
diff --git a/helper/include/odp/helper/ring.h b/helper/include/odp/helper/ring.h
index 8f4b8a9c4..c8c416f71 100644
--- a/helper/include/odp/helper/ring.h
+++ b/helper/include/odp/helper/ring.h
@@ -97,7 +97,7 @@ extern "C" {
 #endif
 
 
-#include <odp.h>
+#include <odp_api.h>
 
 #include <errno.h>
 #include <sys/queue.h>
diff --git a/helper/include/odp/helper/tcp.h b/helper/include/odp/helper/tcp.h
index 4a3ee8664..cabef9072 100644
--- a/helper/include/odp/helper/tcp.h
+++ b/helper/include/odp/helper/tcp.h
@@ -18,7 +18,7 @@
 extern "C" {
 #endif
 
-#include <odp.h>
+#include <odp_api.h>
 
 /** @addtogroup odph_header ODPH HEADER
  *  @{
diff --git a/helper/include/odp/helper/udp.h b/helper/include/odp/helper/udp.h
index 163b610b7..812f5b933 100644
--- a/helper/include/odp/helper/udp.h
+++ b/helper/include/odp/helper/udp.h
@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-#include <odp.h>
+#include <odp_api.h>
 
 /** @addtogroup odph_header ODPH HEADER
  *  @{
diff --git a/helper/lineartable.c b/helper/lineartable.c
index 68d935000..e82c1651c 100644
--- a/helper/lineartable.c
+++ b/helper/lineartable.c
@@ -10,7 +10,7 @@
 
 #include "odph_lineartable.h"
 #include "odph_debug.h"
-#include <odp.h>
+#include <odp_api.h>
 
 #define     ODPH_SUCCESS	0
 #define     ODPH_FAIL		-1
diff --git a/helper/linux.c b/helper/linux.c
index f0df48e47..351856dea 100644
--- a/helper/linux.c
+++ b/helper/linux.c
@@ -17,7 +17,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp/helper/linux.h>
 #include "odph_debug.h"
 
diff --git a/helper/ring.c b/helper/ring.c
index 669918682..6e3f07aaa 100644
--- a/helper/ring.c
+++ b/helper/ring.c
@@ -69,7 +69,7 @@
  *
  ***************************************************************************/
 
-#include <odp.h>
+#include <odp_api.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/helper/test/odp_chksum.c b/helper/test/odp_chksum.c
index 8fae00bc8..997639614 100644
--- a/helper/test/odp_chksum.c
+++ b/helper/test/odp_chksum.c
@@ -5,7 +5,7 @@
  */
 
 #include <test_debug.h>
-#include <odp.h>
+#include <odp_api.h>
 #include <odp/helper/eth.h>
 #include <odp/helper/ip.h>
 #include <odp/helper/udp.h>
diff --git a/helper/test/odp_parse.c b/helper/test/odp_parse.c
index 77c506b17..b5a4ab4dc 100644
--- a/helper/test/odp_parse.c
+++ b/helper/test/odp_parse.c
@@ -6,7 +6,7 @@
 
 #include <test_debug.h>
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp/helper/eth.h>
 #include <odp/helper/ip.h>
 
diff --git a/helper/test/odp_process.c b/helper/test/odp_process.c
index cb9b328bc..796c9be7c 100644
--- a/helper/test/odp_process.c
+++ b/helper/test/odp_process.c
@@ -5,7 +5,7 @@
  */
 
 #include <test_debug.h>
-#include <odp.h>
+#include <odp_api.h>
 #include <odp/helper/linux.h>
 
 #define NUMBER_WORKERS 16 /* 0 = max */
diff --git a/helper/test/odp_table.c b/helper/test/odp_table.c
index 9d5c5dce0..d20a5a680 100644
--- a/helper/test/odp_table.c
+++ b/helper/test/odp_table.c
@@ -7,7 +7,7 @@
 #include <test_debug.h>
 #include <../odph_hashtable.h>
 #include <../odph_lineartable.h>
-#include <odp.h>
+#include <odp_api.h>
 
 /**
  * Address Resolution Protocol (ARP)
diff --git a/helper/test/odp_thread.c b/helper/test/odp_thread.c
index f2f7904c9..8ab3df1fe 100644
--- a/helper/test/odp_thread.c
+++ b/helper/test/odp_thread.c
@@ -5,7 +5,7 @@
  */
 
 #include <test_debug.h>
-#include <odp.h>
+#include <odp_api.h>
 #include <odp/helper/linux.h>
 
 #define NUMBER_WORKERS 16
diff --git a/include/odp.h b/include/odp_api.h
index 57559a670..44b67ee1f 100644
--- a/include/odp.h
+++ b/include/odp_api.h
@@ -11,8 +11,8 @@
  *
  */
 
-#ifndef ODP_H_
-#define ODP_H_
+#ifndef ODP_API_H_
+#define ODP_API_H_
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am
index 6762dd79d..fb7f030fc 100644
--- a/platform/linux-generic/Makefile.am
+++ b/platform/linux-generic/Makefile.am
@@ -9,7 +9,7 @@ AM_CFLAGS +=  -I$(top_srcdir)/include
 AM_CFLAGS +=  -I$(top_srcdir)/helper/include
 
 include_HEADERS = \
-		  $(top_srcdir)/include/odp.h
+		  $(top_srcdir)/include/odp_api.h
 
 odpapiincludedir= $(includedir)/odp/api
 odpapiinclude_HEADERS = \
diff --git a/platform/linux-generic/include/odp_name_table_internal.h b/platform/linux-generic/include/odp_name_table_internal.h
index d81012820..e9a85daa5 100644
--- a/platform/linux-generic/include/odp_name_table_internal.h
+++ b/platform/linux-generic/include/odp_name_table_internal.h
@@ -14,7 +14,7 @@ extern "C" {
 #endif
 
 #include <stdint.h>
-#include <odp.h>
+#include <odp_api.h>
 
 typedef enum {
 	ODP_COS_HANDLE,
diff --git a/platform/linux-generic/include/odp_pkt_queue_internal.h b/platform/linux-generic/include/odp_pkt_queue_internal.h
index 85cdada6d..83375d02c 100644
--- a/platform/linux-generic/include/odp_pkt_queue_internal.h
+++ b/platform/linux-generic/include/odp_pkt_queue_internal.h
@@ -14,7 +14,7 @@ extern "C" {
 #endif
 
 #include <stdint.h>
-#include <odp.h>
+#include <odp_api.h>
 
 typedef uint64_t _odp_int_queue_pool_t;
 typedef uint32_t _odp_int_pkt_queue_t;
diff --git a/platform/linux-generic/include/odp_timer_wheel_internal.h b/platform/linux-generic/include/odp_timer_wheel_internal.h
index ac0aac57c..0e5828f9a 100644
--- a/platform/linux-generic/include/odp_timer_wheel_internal.h
+++ b/platform/linux-generic/include/odp_timer_wheel_internal.h
@@ -14,7 +14,7 @@ extern "C" {
 #endif
 
 #include <stdint.h>
-#include <odp.h>
+#include <odp_api.h>
 
 /* Note that ALL times in this API are in units of processor/cpu clock
  * cycles!
diff --git a/platform/linux-generic/odp_pkt_queue.c b/platform/linux-generic/odp_pkt_queue.c
index 88520b19b..64f4930fc 100644
--- a/platform/linux-generic/odp_pkt_queue.c
+++ b/platform/linux-generic/odp_pkt_queue.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <malloc.h>
 #include <stdio.h>
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_pkt_queue_internal.h>
 #include <odp_debug_internal.h>
 
diff --git a/platform/linux-generic/odp_sorted_list.c b/platform/linux-generic/odp_sorted_list.c
index 5811266f2..9c8d3e16f 100644
--- a/platform/linux-generic/odp_sorted_list.c
+++ b/platform/linux-generic/odp_sorted_list.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <malloc.h>
 #include <stdio.h>
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_debug_internal.h>
 #include <odp_sorted_list_internal.h>
 
diff --git a/platform/linux-generic/odp_timer_wheel.c b/platform/linux-generic/odp_timer_wheel.c
index 21be3ef98..288ea4997 100644
--- a/platform/linux-generic/odp_timer_wheel.c
+++ b/platform/linux-generic/odp_timer_wheel.c
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <malloc.h>
 #include <stdio.h>
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_timer_wheel_internal.h>
 #include <odp_debug_internal.h>
 
diff --git a/platform/linux-generic/pktio/ethtool.c b/platform/linux-generic/pktio/ethtool.c
index 1f2943888..1b0f25b2c 100644
--- a/platform/linux-generic/pktio/ethtool.c
+++ b/platform/linux-generic/pktio/ethtool.c
@@ -12,7 +12,7 @@
 #include <errno.h>
 #include <net/if.h>
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_packet_socket.h>
 #include <odp_debug_internal.h>
 
diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c
index 340e106c1..34d769e3f 100644
--- a/platform/linux-generic/pktio/loop.c
+++ b/platform/linux-generic/pktio/loop.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_packet_internal.h>
 #include <odp_packet_io_internal.h>
 #include <odp_classification_internal.h>
diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c
index c22cce09a..ef42c112c 100644
--- a/platform/linux-generic/pktio/pcap.c
+++ b/platform/linux-generic/pktio/pcap.c
@@ -36,7 +36,7 @@
 
 #include <odp_posix_extensions.h>
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_packet_internal.h>
 #include <odp_packet_io_internal.h>
 
diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c
index 9c5be2272..be539007d 100644
--- a/platform/linux-generic/pktio/socket.c
+++ b/platform/linux-generic/pktio/socket.c
@@ -32,7 +32,7 @@
 #include <linux/ethtool.h>
 #include <linux/sockios.h>
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_packet_socket.h>
 #include <odp_packet_internal.h>
 #include <odp_packet_io_internal.h>
diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c
index 887fcccd7..da2682c33 100644
--- a/platform/linux-generic/pktio/socket_mmap.c
+++ b/platform/linux-generic/pktio/socket_mmap.c
@@ -22,7 +22,7 @@
 #include <sys/ioctl.h>
 #include <errno.h>
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_packet_socket.h>
 #include <odp_packet_internal.h>
 #include <odp_packet_io_internal.h>
diff --git a/platform/linux-generic/pktio/sysfs.c b/platform/linux-generic/pktio/sysfs.c
index 4e5c02837..7aadc14a6 100644
--- a/platform/linux-generic/pktio/sysfs.c
+++ b/platform/linux-generic/pktio/sysfs.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_packet_io_internal.h>
 #include <errno.h>
 #include <string.h>
diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c
index 1eb4f56ad..14cc600a6 100644
--- a/platform/linux-generic/pktio/tap.c
+++ b/platform/linux-generic/pktio/tap.c
@@ -38,7 +38,7 @@
 #include <sys/types.h>
 #include <linux/if_tun.h>
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_packet_socket.h>
 #include <odp_packet_internal.h>
 #include <odp_packet_io_internal.h>
diff --git a/test/api_test/odp_common.c b/test/api_test/odp_common.c
index 70aee96f8..75423ec9d 100644
--- a/test/api_test/odp_common.c
+++ b/test/api_test/odp_common.c
@@ -11,7 +11,7 @@
  */
 
 #include <string.h>
-#include <odp.h>
+#include <odp_api.h>
 #include <odp/helper/linux.h>
 #include <odp_common.h>
 #include <test_debug.h>
diff --git a/test/api_test/odp_ring_test.c b/test/api_test/odp_ring_test.c
index e8a962a89..146c95d44 100644
--- a/test/api_test/odp_ring_test.c
+++ b/test/api_test/odp_ring_test.c
@@ -47,7 +47,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_common.h>
 #include <odp/helper/ring.h>
 #include <test_debug.h>
diff --git a/test/miscellaneous/odp_api_from_cpp.cpp b/test/miscellaneous/odp_api_from_cpp.cpp
index c9733ee3e..be74c275c 100644
--- a/test/miscellaneous/odp_api_from_cpp.cpp
+++ b/test/miscellaneous/odp_api_from_cpp.cpp
@@ -1,5 +1,5 @@
 #include <cstdio>
-#include <odp.h>
+#include <odp_api.h>
 #include <odp/helper/linux.h>
 
 int main(int argc ODP_UNUSED, const char *argv[] ODP_UNUSED)
diff --git a/test/performance/odp_atomic.c b/test/performance/odp_atomic.c
index 067329bdc..69c23e2b1 100644
--- a/test/performance/odp_atomic.c
+++ b/test/performance/odp_atomic.c
@@ -8,7 +8,7 @@
 #include <sys/time.h>
 #include <test_debug.h>
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp/helper/linux.h>
 
 static void test_atomic_inc_dec_u32(void);
diff --git a/test/performance/odp_crypto.c b/test/performance/odp_crypto.c
index 9998b0f26..5fd339d1e 100644
--- a/test/performance/odp_crypto.c
+++ b/test/performance/odp_crypto.c
@@ -16,7 +16,7 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp/helper/linux.h>
 
 #define app_err(fmt, ...) \
diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c
index b631298c5..c245935ef 100644
--- a/test/performance/odp_l2fwd.c
+++ b/test/performance/odp_l2fwd.c
@@ -22,7 +22,7 @@
 
 #include <test_debug.h>
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp/helper/linux.h>
 #include <odp/helper/eth.h>
 #include <odp/helper/ip.h>
diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c
index 9a4735579..0fbecec00 100644
--- a/test/performance/odp_pktio_perf.c
+++ b/test/performance/odp_pktio_perf.c
@@ -20,7 +20,7 @@
  * a single packet rate can be specified on the command line.
  *
  */
-#include <odp.h>
+#include <odp_api.h>
 
 #include <odp/helper/eth.h>
 #include <odp/helper/ip.h>
diff --git a/test/performance/odp_scheduling.c b/test/performance/odp_scheduling.c
index 27649487c..1f6d62d40 100644
--- a/test/performance/odp_scheduling.c
+++ b/test/performance/odp_scheduling.c
@@ -16,7 +16,7 @@
 #include <test_debug.h>
 
 /* ODP main header */
-#include <odp.h>
+#include <odp_api.h>
 
 /* ODP helper for Linux apps */
 #include <odp/helper/linux.h>
diff --git a/test/validation/atomic/atomic.c b/test/validation/atomic/atomic.c
index 24c0de731..1c81bdd08 100644
--- a/test/validation/atomic/atomic.c
+++ b/test/validation/atomic/atomic.c
@@ -5,7 +5,7 @@
  */
 
 #include <malloc.h>
-#include <odp.h>
+#include <odp_api.h>
 #include <CUnit/Basic.h>
 #include <odp_cunit_common.h>
 #include <unistd.h>
diff --git a/test/validation/barrier/barrier.c b/test/validation/barrier/barrier.c
index 8f15cdf0d..98df247a9 100644
--- a/test/validation/barrier/barrier.c
+++ b/test/validation/barrier/barrier.c
@@ -5,7 +5,7 @@
  */
 
 #include <malloc.h>
-#include <odp.h>
+#include <odp_api.h>
 #include <CUnit/Basic.h>
 #include <odp_cunit_common.h>
 #include <unistd.h>
diff --git a/test/validation/buffer/buffer.c b/test/validation/buffer/buffer.c
index 9c8da8128..c336ac321 100644
--- a/test/validation/buffer/buffer.c
+++ b/test/validation/buffer/buffer.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
-#include <odp.h>
+#include <odp_api.h>
 #include "odp_cunit_common.h"
 #include "buffer.h"
 
diff --git a/test/validation/classification/classification.c b/test/validation/classification/classification.c
index 9c3dbbb69..a266c5602 100644
--- a/test/validation/classification/classification.c
+++ b/test/validation/classification/classification.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_cunit_common.h>
 #include "odp_classification_testsuites.h"
 #include "classification.h"
diff --git a/test/validation/classification/odp_classification_testsuites.h b/test/validation/classification/odp_classification_testsuites.h
index 44577a082..8d5b5ff13 100644
--- a/test/validation/classification/odp_classification_testsuites.h
+++ b/test/validation/classification/odp_classification_testsuites.h
@@ -7,7 +7,7 @@
 #ifndef ODP_CLASSIFICATION_TESTSUITES_H_
 #define ODP_CLASSIFICATION_TESTSUITES_H_
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_cunit_common.h>
 
 extern odp_testinfo_t classification_suite[];
diff --git a/test/validation/common/mask_common.c b/test/validation/common/mask_common.c
index 9b1a23f46..500136499 100644
--- a/test/validation/common/mask_common.c
+++ b/test/validation/common/mask_common.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp.h>
+#include <odp_api.h>
 
 #include "odp_cunit_common.h"
 #include "mask_common.h"
diff --git a/test/validation/common/odp_cunit_common.c b/test/validation/common/odp_cunit_common.c
index 587692394..dbd8229e2 100644
--- a/test/validation/common/odp_cunit_common.c
+++ b/test/validation/common/odp_cunit_common.c
@@ -5,7 +5,7 @@
  */
 
 #include <string.h>
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_cunit_common.h>
 #include <odp/helper/linux.h>
 /* Globals */
diff --git a/test/validation/config/config.c b/test/validation/config/config.c
index f957150cf..380163cca 100644
--- a/test/validation/config/config.c
+++ b/test/validation/config/config.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
-#include <odp.h>
+#include <odp_api.h>
 #include "odp_cunit_common.h"
 #include "config.h"
 
diff --git a/test/validation/cpumask/cpumask.c b/test/validation/cpumask/cpumask.c
index 2419f47dc..017332a58 100644
--- a/test/validation/cpumask/cpumask.c
+++ b/test/validation/cpumask/cpumask.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp.h>
+#include <odp_api.h>
 
 #include "odp_cunit_common.h"
 #include "cpumask.h"
diff --git a/test/validation/cpumask/cpumask.h b/test/validation/cpumask/cpumask.h
index c6f9cde9d..2019f7a99 100644
--- a/test/validation/cpumask/cpumask.h
+++ b/test/validation/cpumask/cpumask.h
@@ -7,7 +7,7 @@
 #ifndef _ODP_TEST_CPUMASK_H_
 #define _ODP_TEST_CPUMASK_H_
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_cunit_common.h>
 
 /* test functions: */
diff --git a/test/validation/crypto/crypto.c b/test/validation/crypto/crypto.c
index b2d8f459d..a0411c6f5 100644
--- a/test/validation/crypto/crypto.c
+++ b/test/validation/crypto/crypto.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_cunit_common.h>
 #include "odp_crypto_test_inp.h"
 #include "crypto.h"
diff --git a/test/validation/crypto/odp_crypto_test_inp.c b/test/validation/crypto/odp_crypto_test_inp.c
index b6fcb1272..fc125f7f2 100644
--- a/test/validation/crypto/odp_crypto_test_inp.c
+++ b/test/validation/crypto/odp_crypto_test_inp.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
-#include <odp.h>
+#include <odp_api.h>
 #include <CUnit/Basic.h>
 #include <odp_cunit_common.h>
 #include "test_vectors.h"
diff --git a/test/validation/errno/errno.c b/test/validation/errno/errno.c
index d0e2128c6..9dd1be6f5 100644
--- a/test/validation/errno/errno.c
+++ b/test/validation/errno/errno.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp.h>
+#include <odp_api.h>
 #include "odp_cunit_common.h"
 #include "errno.h"
 
diff --git a/test/validation/hash/hash.c b/test/validation/hash/hash.c
index 11b331e28..faba0b678 100644
--- a/test/validation/hash/hash.c
+++ b/test/validation/hash/hash.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_cunit_common.h>
 #include "hash.h"
 
diff --git a/test/validation/init/init.c b/test/validation/init/init.c
index 62bd75cc6..665c3dc4e 100644
--- a/test/validation/init/init.c
+++ b/test/validation/init/init.c
@@ -6,7 +6,7 @@
 
 #include <stdarg.h>
 #include <stdlib.h>
-#include <odp.h>
+#include <odp_api.h>
 #include <CUnit/Basic.h>
 #include "init.h"
 
diff --git a/test/validation/lock/lock.c b/test/validation/lock/lock.c
index 0f4415dba..f1f6d69f8 100644
--- a/test/validation/lock/lock.c
+++ b/test/validation/lock/lock.c
@@ -5,7 +5,7 @@
  */
 
 #include <malloc.h>
-#include <odp.h>
+#include <odp_api.h>
 #include <CUnit/Basic.h>
 #include <odp_cunit_common.h>
 #include <unistd.h>
diff --git a/test/validation/packet/packet.c b/test/validation/packet/packet.c
index c5e23569b..a764ed92f 100644
--- a/test/validation/packet/packet.c
+++ b/test/validation/packet/packet.c
@@ -6,7 +6,7 @@
 
 #include <stdlib.h>
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_cunit_common.h>
 #include "packet.h"
 
diff --git a/test/validation/pktio/pktio.c b/test/validation/pktio/pktio.c
index f3577ec50..216c7a620 100644
--- a/test/validation/pktio/pktio.c
+++ b/test/validation/pktio/pktio.c
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_cunit_common.h>
 
 #include <odp/helper/eth.h>
diff --git a/test/validation/pool/pool.c b/test/validation/pool/pool.c
index bca210aa4..7f3299113 100644
--- a/test/validation/pool/pool.c
+++ b/test/validation/pool/pool.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
-#include <odp.h>
+#include <odp_api.h>
 #include "odp_cunit_common.h"
 #include "pool.h"
 
diff --git a/test/validation/queue/queue.c b/test/validation/queue/queue.c
index 7c55eb335..50c6857d2 100644
--- a/test/validation/queue/queue.c
+++ b/test/validation/queue/queue.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_cunit_common.h>
 #include "queue.h"
 
diff --git a/test/validation/random/random.c b/test/validation/random/random.c
index 8ed594420..7f899e83e 100644
--- a/test/validation/random/random.c
+++ b/test/validation/random/random.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_cunit_common.h>
 #include "random.h"
 
diff --git a/test/validation/scheduler/scheduler.c b/test/validation/scheduler/scheduler.c
index dcf01c073..5631618f0 100644
--- a/test/validation/scheduler/scheduler.c
+++ b/test/validation/scheduler/scheduler.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp.h>
+#include <odp_api.h>
 #include "odp_cunit_common.h"
 #include "scheduler.h"
 
diff --git a/test/validation/shmem/shmem.c b/test/validation/shmem/shmem.c
index 08425e663..ba4973d49 100644
--- a/test/validation/shmem/shmem.c
+++ b/test/validation/shmem/shmem.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_cunit_common.h>
 #include "shmem.h"
 
diff --git a/test/validation/std_clib/std_clib.c b/test/validation/std_clib/std_clib.c
index e69bc3901..5d5beab34 100644
--- a/test/validation/std_clib/std_clib.c
+++ b/test/validation/std_clib/std_clib.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_cunit_common.h>
 #include "std_clib.h"
 
diff --git a/test/validation/system/system.c b/test/validation/system/system.c
index de953f0a7..7520d16ea 100644
--- a/test/validation/system/system.c
+++ b/test/validation/system/system.c
@@ -5,7 +5,7 @@
  */
 
 #include <ctype.h>
-#include <odp.h>
+#include <odp_api.h>
 #include <odp/api/cpumask.h>
 #include "odp_cunit_common.h"
 #include "test_debug.h"
diff --git a/test/validation/thread/thread.c b/test/validation/thread/thread.c
index 03bf3cd2d..5cbec8323 100644
--- a/test/validation/thread/thread.c
+++ b/test/validation/thread/thread.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_cunit_common.h>
 #include <mask_common.h>
 #include <test_debug.h>
diff --git a/test/validation/thread/thread.h b/test/validation/thread/thread.h
index 6cbc69432..f8ea71034 100644
--- a/test/validation/thread/thread.h
+++ b/test/validation/thread/thread.h
@@ -7,7 +7,7 @@
 #ifndef _ODP_TEST_THREAD_H_
 #define _ODP_TEST_THREAD_H_
 
-#include <odp.h>
+#include <odp_api.h>
 #include <odp_cunit_common.h>
 
 /* test functions: */
diff --git a/test/validation/time/time.c b/test/validation/time/time.c
index 4eb6dd508..cd475e6a6 100644
--- a/test/validation/time/time.c
+++ b/test/validation/time/time.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#include <odp.h>
+#include <odp_api.h>
 #include "odp_cunit_common.h"
 #include "time.h"
 
diff --git a/test/validation/timer/timer.c b/test/validation/timer/timer.c
index 004670ad9..c17c40766 100644
--- a/test/validation/timer/timer.c
+++ b/test/validation/timer/timer.c
@@ -14,7 +14,7 @@
 #endif
 
 #include <time.h>
-#include <odp.h>
+#include <odp_api.h>
 #include "odp_cunit_common.h"
 #include "test_debug.h"
 #include "timer.h"