[COMMIT] branch master updated. v1.21.0.0-210-g9a2c3cdbb - git-lng-odp

27 Sep 2019

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "".
The branch, master has been updated
       via  9a2c3cdbb542c7514e5d89c38b5d3d534a7dc240 (commit)
      from  235478efa4afa44167b0af95b5ee10e635beed08 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9a2c3cdbb542c7514e5d89c38b5d3d534a7dc240
Author: Matias Elo matias.elo@nokia.com
Date:   Tue Sep 24 10:25:47 2019 +0300
linux-gen: include config.h header in install directory
Previously, config.h header was not included in install dir. This caused a
    compilation failure when an application tried to include ODP helper
    headers.
config.h has been moved to include/odp subdirectory to avoid naming
    conflicts and unnecessary includes have been removed.
Signed-off-by: Matias Elo matias.elo@nokia.com
    Reviewed-by: Petri Savolainen petri.savolainen@nokia.com
    Reported-by: Mikko Parpala mikko.parpala@nokia.com

diff --git a/.gitignore b/.gitignore
index 4653f8976..963b86438 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,8 +38,8 @@ depcomp
 doc/output
 dpdk/
 install-sh
-include/config.h.in
-include/config.h
+include/odp/config.h.in
+include/odp/config.h
 include/stamp-h1
 lib/
 libtool
diff --git a/configure.ac b/configure.ac
index 2eb284a7c..857905c3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ AS_IF([test "$ac_cv_env_CFLAGS_set" = ""], [user_cflags=0], [user_cflags=1])
 # Initialize automake
 AM_INIT_AUTOMAKE([1.9 tar-pax subdir-objects foreign nostdinc -Wall -Werror])
 AC_CONFIG_SRCDIR([include/odp/api/spec/init.h])
-AM_CONFIG_HEADER([include/config.h])
+AM_CONFIG_HEADER([include/odp/config.h])
AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
diff --git a/helper/chksum.c b/helper/chksum.c
index c3e712421..e9ef19a62 100644
--- a/helper/chksum.c
+++ b/helper/chksum.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp.h>
 #include <odp/helper/ip.h>
 #include <odp/helper/udp.h>
diff --git a/helper/cuckootable.c b/helper/cuckootable.c
index 5609e6906..237c2f297 100644
--- a/helper/cuckootable.c
+++ b/helper/cuckootable.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 /*-
  *   BSD LICENSE
  *
diff --git a/helper/eth.c b/helper/eth.c
index d46283b23..86a0be6f5 100644
--- a/helper/eth.c
+++ b/helper/eth.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/helper/eth.h>
#include <stdio.h>
diff --git a/helper/hashtable.c b/helper/hashtable.c
index 496bca5e6..ac11acb15 100644
--- a/helper/hashtable.c
+++ b/helper/hashtable.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:   BSD-3-Clause
  */
-#include "config.h"
-
 #include <stdio.h>
 #include <string.h>
 #include <malloc.h>
diff --git a/helper/include/odp/helper/odph_debug.h b/helper/include/odp/helper/odph_debug.h
index ef520497b..370a0fa12 100644
--- a/helper/include/odp/helper/odph_debug.h
+++ b/helper/include/odp/helper/odph_debug.h
@@ -15,7 +15,7 @@
 #ifndef ODPH_DEBUG_H_
 #define ODPH_DEBUG_H_
-#include "config.h"
+#include <odp/config.h>
#include <stdio.h>
 #include <stdlib.h>
diff --git a/helper/ip.c b/helper/ip.c
index 8ecda69e0..9e02892aa 100644
--- a/helper/ip.c
+++ b/helper/ip.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/helper/ip.h>
#include <stdio.h>
diff --git a/helper/iplookuptable.c b/helper/iplookuptable.c
index 1b5538ab8..c02ee5415 100644
--- a/helper/iplookuptable.c
+++ b/helper/iplookuptable.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <string.h>
 #include <stdint.h>
 #include <errno.h>
diff --git a/helper/lineartable.c b/helper/lineartable.c
index 864c7973f..0999569cc 100644
--- a/helper/lineartable.c
+++ b/helper/lineartable.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
-#include "config.h"
-
 #include <stdio.h>
 #include <string.h>
 #include <malloc.h>
diff --git a/helper/linux/thread.c b/helper/linux/thread.c
index eecd6fed1..c7ed24512 100644
--- a/helper/linux/thread.c
+++ b/helper/linux/thread.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
diff --git a/helper/test/chksum.c b/helper/test/chksum.c
index a569f2394..d14ee20d1 100644
--- a/helper/test/chksum.c
+++ b/helper/test/chksum.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include <odp/helper/odph_api.h>
diff --git a/helper/test/cuckootable.c b/helper/test/cuckootable.c
index 22df27f3d..d11e944f9 100644
--- a/helper/test/cuckootable.c
+++ b/helper/test/cuckootable.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 /*-
  *   BSD LICENSE
  *
diff --git a/helper/test/debug.c b/helper/test/debug.c
index e20fd325a..48d4462c9 100644
--- a/helper/test/debug.c
+++ b/helper/test/debug.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
+#include <odp/config.h>
#include <odp_api.h>
 #include <odp/helper/odph_api.h>
diff --git a/helper/test/iplookuptable.c b/helper/test/iplookuptable.c
index 8ffc75efe..bd724b1b7 100644
--- a/helper/test/iplookuptable.c
+++ b/helper/test/iplookuptable.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/helper/test/linux/process.c b/helper/test/linux/process.c
index 0bc53e5a7..f57b5ab8a 100644
--- a/helper/test/linux/process.c
+++ b/helper/test/linux/process.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include <odp/helper/odph_api.h>
 #include <odp/helper/linux/pthread.h>
diff --git a/helper/test/linux/pthread.c b/helper/test/linux/pthread.c
index e14d5cdf8..770308faa 100644
--- a/helper/test/linux/pthread.c
+++ b/helper/test/linux/pthread.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include <odp/helper/odph_api.h>
 #include <odp/helper/linux/pthread.h>
diff --git a/helper/test/odpthreads.c b/helper/test/odpthreads.c
index 83f9476fd..1540ad503 100644
--- a/helper/test/odpthreads.c
+++ b/helper/test/odpthreads.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 /*
  * This program tests the ability of the linux helper to create ODP threads,
  * either implemented as linux pthreads or as linux processes, depending on
diff --git a/helper/test/parse.c b/helper/test/parse.c
index 5f8c5846a..3097ae476 100644
--- a/helper/test/parse.c
+++ b/helper/test/parse.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include <odp/helper/odph_api.h>
diff --git a/helper/test/table.c b/helper/test/table.c
index 1a889392c..df7a23d6e 100644
--- a/helper/test/table.c
+++ b/helper/test/table.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include <odp/helper/odph_api.h>
diff --git a/helper/test/version.c b/helper/test/version.c
index 22ee2955d..925d305da 100644
--- a/helper/test/version.c
+++ b/helper/test/version.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include <odp/helper/odph_api.h>
diff --git a/helper/threads.c b/helper/threads.c
index 37a0c25db..431712d93 100644
--- a/helper/threads.c
+++ b/helper/threads.c
@@ -5,8 +5,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
diff --git a/include/Makefile.am b/include/Makefile.am
index 49ed0164e..ed33e7c8e 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -4,6 +4,7 @@ include_HEADERS = \
odpincludedir= $(includedir)/odp
 odpinclude_HEADERS = \
+		  odp/config.h \
    	  odp/visibility_begin.h \
    	  odp/visibility_end.h
diff --git a/platform/linux-generic/arch/aarch64/odp_global_time.c b/platform/linux-generic/arch/aarch64/odp_global_time.c
index 91e5c7a66..fa59f5a15 100644
--- a/platform/linux-generic/arch/aarch64/odp_global_time.c
+++ b/platform/linux-generic/arch/aarch64/odp_global_time.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_posix_extensions.h>
#include <time.h>
diff --git a/platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c b/platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c
index 3a1486dd2..966d0d85a 100644
--- a/platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c
+++ b/platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c
@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
#include <stdio.h>
 #include <string.h>
diff --git a/platform/linux-generic/arch/default/odp_cpu_cycles.c b/platform/linux-generic/arch/default/odp_cpu_cycles.c
index 88e70b2e4..542a68dbe 100644
--- a/platform/linux-generic/arch/default/odp_cpu_cycles.c
+++ b/platform/linux-generic/arch/default/odp_cpu_cycles.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_posix_extensions.h>
#include <stdlib.h>
diff --git a/platform/linux-generic/arch/default/odp_sysinfo_parse.c b/platform/linux-generic/arch/default/odp_sysinfo_parse.c
index da3f2eb3f..3db15828d 100644
--- a/platform/linux-generic/arch/default/odp_sysinfo_parse.c
+++ b/platform/linux-generic/arch/default/odp_sysinfo_parse.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_sysinfo_internal.h>
int cpuinfo_parser(FILE *file ODP_UNUSED, system_info_t *sysinfo)
diff --git a/platform/linux-generic/arch/mips64/odp_cpu_cycles.c b/platform/linux-generic/arch/mips64/odp_cpu_cycles.c
index 72a0e5b0c..6423af76d 100644
--- a/platform/linux-generic/arch/mips64/odp_cpu_cycles.c
+++ b/platform/linux-generic/arch/mips64/odp_cpu_cycles.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/cpu.h>
 #include <odp/api/hints.h>
 #include <odp/api/system_info.h>
diff --git a/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c b/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c
index 7b313b6d0..af8d910e8 100644
--- a/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c
+++ b/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_sysinfo_internal.h>
 #include <string.h>
diff --git a/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c b/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c
index 1fb1b4a3e..769bdd4ca 100644
--- a/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c
+++ b/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_sysinfo_internal.h>
 #include <string.h>
diff --git a/platform/linux-generic/arch/x86/cpu_flags.c b/platform/linux-generic/arch/x86/cpu_flags.c
index 935af2cb7..f5c9c0d45 100644
--- a/platform/linux-generic/arch/x86/cpu_flags.c
+++ b/platform/linux-generic/arch/x86/cpu_flags.c
@@ -37,8 +37,6 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "config.h"
-
 #include "cpu_flags.h"
 #include <odp_debug_internal.h>
 #include <odp/api/abi/cpu_time.h>
diff --git a/platform/linux-generic/arch/x86/odp_global_time.c b/platform/linux-generic/arch/x86/odp_global_time.c
index e46a75865..d4d7ab150 100644
--- a/platform/linux-generic/arch/x86/odp_global_time.c
+++ b/platform/linux-generic/arch/x86/odp_global_time.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_posix_extensions.h>
#include <time.h>
diff --git a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c
index 7124e84f2..084ec730b 100644
--- a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c
+++ b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_sysinfo_internal.h>
 #include "cpu_flags.h"
 #include <string.h>
diff --git a/platform/linux-generic/include/odp_debug_internal.h b/platform/linux-generic/include/odp_debug_internal.h
index 4dbe01b59..2ef5a24a8 100644
--- a/platform/linux-generic/include/odp_debug_internal.h
+++ b/platform/linux-generic/include/odp_debug_internal.h
@@ -16,10 +16,13 @@
 #ifndef ODP_DEBUG_INTERNAL_H_
 #define ODP_DEBUG_INTERNAL_H_
-#include <stdio.h>
-#include <stdlib.h>
+#include <odp/config.h>
 #include <odp/api/debug.h>
 #include <odp_global_data.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/platform/linux-generic/include/odp_packet_io_internal.h b/platform/linux-generic/include/odp_packet_io_internal.h
index 18bbf6de8..645b27907 100644
--- a/platform/linux-generic/include/odp_packet_io_internal.h
+++ b/platform/linux-generic/include/odp_packet_io_internal.h
@@ -18,6 +18,8 @@
 extern "C" {
 #endif
+#include <odp/config.h>
+
 #include <odp/api/packet_io.h>
 #include <odp/api/plat/pktio_inlines.h>
 #include <odp/api/spinlock.h>
@@ -34,6 +36,7 @@ extern "C" {
 #include <string.h>
 #include <net/if.h>
 #include <linux/if_ether.h>
+#include <sys/select.h>
#define PKTIO_MAX_QUEUES 64
diff --git a/platform/linux-generic/include/odp_schedule_if.h b/platform/linux-generic/include/odp_schedule_if.h
index 88f1ea022..ef1bbf33b 100644
--- a/platform/linux-generic/include/odp_schedule_if.h
+++ b/platform/linux-generic/include/odp_schedule_if.h
@@ -87,9 +87,7 @@ int sched_cb_pktin_poll_one(int pktio_index, int rx_queue, odp_event_t evts[]);
 void sched_cb_pktio_stop_finalize(int pktio_index);
/* For debugging */
-#ifdef ODP_DEBUG
 extern int _odp_schedule_configured;
-#endif
/* API functions */
 typedef struct {
diff --git a/platform/linux-generic/odp_atomic.c b/platform/linux-generic/odp_atomic.c
index 79b967494..32ddc95c2 100644
--- a/platform/linux-generic/odp_atomic.c
+++ b/platform/linux-generic/odp_atomic.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.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_atomic_api.c b/platform/linux-generic/odp_atomic_api.c
index 72b55a8f1..c56f2c53f 100644
--- a/platform/linux-generic/odp_atomic_api.c
+++ b/platform/linux-generic/odp_atomic_api.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/atomic.h>
/* Include non-inlined versions of API functions */
diff --git a/platform/linux-generic/odp_barrier.c b/platform/linux-generic/odp_barrier.c
index 132ba370e..3747713f6 100644
--- a/platform/linux-generic/odp_barrier.c
+++ b/platform/linux-generic/odp_barrier.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/barrier.h>
 #include <odp/api/sync.h>
 #include <odp/api/cpu.h>
diff --git a/platform/linux-generic/odp_bitmap.c b/platform/linux-generic/odp_bitmap.c
index 09de8733a..aa8734686 100644
--- a/platform/linux-generic/odp_bitmap.c
+++ b/platform/linux-generic/odp_bitmap.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <string.h>
 #include <unistd.h>
 #include <odp/api/std_types.h>
diff --git a/platform/linux-generic/odp_buffer.c b/platform/linux-generic/odp_buffer.c
index f3864bfda..67f0d4e26 100644
--- a/platform/linux-generic/odp_buffer.c
+++ b/platform/linux-generic/odp_buffer.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/buffer.h>
 #include <odp_pool_internal.h>
 #include <odp_buffer_internal.h>
diff --git a/platform/linux-generic/odp_byteorder_api.c b/platform/linux-generic/odp_byteorder_api.c
index 7d8c9516d..4b9f0da7a 100644
--- a/platform/linux-generic/odp_byteorder_api.c
+++ b/platform/linux-generic/odp_byteorder_api.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/byteorder.h>
/* Include non-inlined versions of API functions */
diff --git a/platform/linux-generic/odp_classification.c b/platform/linux-generic/odp_classification.c
index e3f1cc6e0..9bf104e3b 100644
--- a/platform/linux-generic/odp_classification.c
+++ b/platform/linux-generic/odp_classification.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/classification.h>
 #include <odp/api/align.h>
 #include <odp/api/queue.h>
diff --git a/platform/linux-generic/odp_comp.c b/platform/linux-generic/odp_comp.c
index 25ed11f55..a5dfb4aa7 100644
--- a/platform/linux-generic/odp_comp.c
+++ b/platform/linux-generic/odp_comp.c
@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
#include <string.h>
diff --git a/platform/linux-generic/odp_cpu_api.c b/platform/linux-generic/odp_cpu_api.c
index 2e856ec25..503fbd4c7 100644
--- a/platform/linux-generic/odp_cpu_api.c
+++ b/platform/linux-generic/odp_cpu_api.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/cpu.h>
/* Non-inlined functions for ABI compat mode */
diff --git a/platform/linux-generic/odp_cpumask.c b/platform/linux-generic/odp_cpumask.c
index 551a80d82..b8b9f325c 100644
--- a/platform/linux-generic/odp_cpumask.c
+++ b/platform/linux-generic/odp_cpumask.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_posix_extensions.h>
#include <sched.h>
diff --git a/platform/linux-generic/odp_cpumask_task.c b/platform/linux-generic/odp_cpumask_task.c
index c269116ce..70b85f1cb 100644
--- a/platform/linux-generic/odp_cpumask_task.c
+++ b/platform/linux-generic/odp_cpumask_task.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_posix_extensions.h>
#include <sched.h>
diff --git a/platform/linux-generic/odp_crypto_null.c b/platform/linux-generic/odp_crypto_null.c
index 4dd1f8325..c19cb6824 100644
--- a/platform/linux-generic/odp_crypto_null.c
+++ b/platform/linux-generic/odp_crypto_null.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_posix_extensions.h>
 #include <odp/api/crypto.h>
 #include <odp_init_internal.h>
diff --git a/platform/linux-generic/odp_crypto_openssl.c b/platform/linux-generic/odp_crypto_openssl.c
index 3f03b63fa..3911b8f4a 100644
--- a/platform/linux-generic/odp_crypto_openssl.c
+++ b/platform/linux-generic/odp_crypto_openssl.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_posix_extensions.h>
 #include <odp/api/crypto.h>
 #include <odp_init_internal.h>
diff --git a/platform/linux-generic/odp_errno.c b/platform/linux-generic/odp_errno.c
index 071ca6060..38c26d6d4 100644
--- a/platform/linux-generic/odp_errno.c
+++ b/platform/linux-generic/odp_errno.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/errno.h>
 #include <string.h>
 #include <stdio.h>
diff --git a/platform/linux-generic/odp_event.c b/platform/linux-generic/odp_event.c
index efcbc1e26..6f6b3aa0b 100644
--- a/platform/linux-generic/odp_event.c
+++ b/platform/linux-generic/odp_event.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/event.h>
 #include <odp/api/buffer.h>
 #include <odp/api/crypto.h>
diff --git a/platform/linux-generic/odp_event_api.c b/platform/linux-generic/odp_event_api.c
index ea9e61106..4fbc98ddf 100644
--- a/platform/linux-generic/odp_event_api.c
+++ b/platform/linux-generic/odp_event_api.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/event.h>
/* Non-inlined functions for ABI compat mode */
diff --git a/platform/linux-generic/odp_fdserver.c b/platform/linux-generic/odp_fdserver.c
index 232d7f4e0..97f0e9ba0 100644
--- a/platform/linux-generic/odp_fdserver.c
+++ b/platform/linux-generic/odp_fdserver.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 /*
  * This file implements a file descriptor sharing server enabling
  * sharing of file descriptors between processes, regardless of fork time.
diff --git a/platform/linux-generic/odp_hash_crc32c.c b/platform/linux-generic/odp_hash_crc32c.c
index 9e3e7d8fe..304b8e2a5 100644
--- a/platform/linux-generic/odp_hash_crc32c.c
+++ b/platform/linux-generic/odp_hash_crc32c.c
@@ -37,8 +37,6 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "config.h"
-
 #include <odp/api/hash.h>
 #include <odp/api/std_types.h>
diff --git a/platform/linux-generic/odp_impl.c b/platform/linux-generic/odp_impl.c
index 227d50005..855f29358 100644
--- a/platform/linux-generic/odp_impl.c
+++ b/platform/linux-generic/odp_impl.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
+#include <odp/config.h>
 #include <odp/api/version.h>
#define ODP_VERSION_IMPL 0
diff --git a/platform/linux-generic/odp_init.c b/platform/linux-generic/odp_init.c
index a09583ee5..7d2477b0b 100644
--- a/platform/linux-generic/odp_init.c
+++ b/platform/linux-generic/odp_init.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_posix_extensions.h>
#include <odp/api/init.h>
diff --git a/platform/linux-generic/odp_ipsec.c b/platform/linux-generic/odp_ipsec.c
index cd1baa51a..5511989c2 100644
--- a/platform/linux-generic/odp_ipsec.c
+++ b/platform/linux-generic/odp_ipsec.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/ipsec.h>
 #include <odp/api/chksum.h>
diff --git a/platform/linux-generic/odp_ipsec_events.c b/platform/linux-generic/odp_ipsec_events.c
index c1d153c09..cbeb43780 100644
--- a/platform/linux-generic/odp_ipsec_events.c
+++ b/platform/linux-generic/odp_ipsec_events.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/ipsec.h>
 #include <odp/api/shared_memory.h>
diff --git a/platform/linux-generic/odp_ipsec_sad.c b/platform/linux-generic/odp_ipsec_sad.c
index 6eb12f95f..1fb814c5b 100644
--- a/platform/linux-generic/odp_ipsec_sad.c
+++ b/platform/linux-generic/odp_ipsec_sad.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/atomic.h>
 #include <odp/api/ipsec.h>
 #include <odp/api/random.h>
diff --git a/platform/linux-generic/odp_ishm.c b/platform/linux-generic/odp_ishm.c
index aa4d497a5..cd483d146 100644
--- a/platform/linux-generic/odp_ishm.c
+++ b/platform/linux-generic/odp_ishm.c
@@ -5,8 +5,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 /* This file handles the internal shared memory: internal shared memory
  * is memory which is sharable by all ODP threads regardless of how the
  * ODP thread is implemented (pthread or process) and regardless of fork()
diff --git a/platform/linux-generic/odp_ishmphy.c b/platform/linux-generic/odp_ishmphy.c
index 65e0cc826..64eb2a732 100644
--- a/platform/linux-generic/odp_ishmphy.c
+++ b/platform/linux-generic/odp_ishmphy.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 /*
  * This file handles the lower end of the ishm memory allocator:
  * It performs the physical mappings.
diff --git a/platform/linux-generic/odp_ishmpool.c b/platform/linux-generic/odp_ishmpool.c
index 9a4e08fab..e6cb5fcff 100644
--- a/platform/linux-generic/odp_ishmpool.c
+++ b/platform/linux-generic/odp_ishmpool.c
@@ -41,7 +41,6 @@
  * The second one regroups the functions needed by the slab allocator.
  * The third section regroups the common functions exported externally.
  */
-#include "config.h"
#include <odp_posix_extensions.h>
 #include <odp/api/spinlock.h>
diff --git a/platform/linux-generic/odp_libconfig.c b/platform/linux-generic/odp_libconfig.c
index 014409e2b..8b061f5fa 100644
--- a/platform/linux-generic/odp_libconfig.c
+++ b/platform/linux-generic/odp_libconfig.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <stdlib.h>
 #include <string.h>
 #include <libconfig.h>
diff --git a/platform/linux-generic/odp_name_table.c b/platform/linux-generic/odp_name_table.c
index 233f6f74b..b4825fa18 100644
--- a/platform/linux-generic/odp_name_table.c
+++ b/platform/linux-generic/odp_name_table.c
@@ -6,8 +6,6 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include "config.h"
-
 #include <stdint.h>
 #include <string.h>
 #include <malloc.h>
diff --git a/platform/linux-generic/odp_packet.c b/platform/linux-generic/odp_packet.c
index be62557d5..d2327cff1 100644
--- a/platform/linux-generic/odp_packet.c
+++ b/platform/linux-generic/odp_packet.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
+#include <odp/config.h>
#include <odp/api/packet.h>
 #include <odp/api/plat/packet_inlines.h>
diff --git a/platform/linux-generic/odp_packet_api.c b/platform/linux-generic/odp_packet_api.c
index 6bc37db47..6f81f4ce4 100644
--- a/platform/linux-generic/odp_packet_api.c
+++ b/platform/linux-generic/odp_packet_api.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/packet.h>
 #include <odp_packet_internal.h>
 #include <odp_debug_internal.h>
diff --git a/platform/linux-generic/odp_packet_flags.c b/platform/linux-generic/odp_packet_flags.c
index 48ebab107..bb5c26792 100644
--- a/platform/linux-generic/odp_packet_flags.c
+++ b/platform/linux-generic/odp_packet_flags.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/plat/packet_flag_inlines.h>
 #include <odp/api/packet_flags.h>
 #include <odp_packet_internal.h>
diff --git a/platform/linux-generic/odp_packet_flags_api.c b/platform/linux-generic/odp_packet_flags_api.c
index a4ecbc634..e77f22c3e 100644
--- a/platform/linux-generic/odp_packet_flags_api.c
+++ b/platform/linux-generic/odp_packet_flags_api.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/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 91555c680..0710b718a 100644
--- a/platform/linux-generic/odp_packet_io.c
+++ b/platform/linux-generic/odp_packet_io.c
@@ -5,10 +5,9 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_posix_extensions.h>
+#include <odp/config.h>
 #include <odp/api/packet_io.h>
 #include <odp/api/plat/pktio_inlines.h>
 #include <odp_packet_io_internal.h>
diff --git a/platform/linux-generic/odp_pcapng.c b/platform/linux-generic/odp_pcapng.c
index b6d91fbc8..09cb91b1d 100644
--- a/platform/linux-generic/odp_pcapng.c
+++ b/platform/linux-generic/odp_pcapng.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
+#include <odp/config.h>
#if defined(_ODP_PCAPNG) && _ODP_PCAPNG == 1
diff --git a/platform/linux-generic/odp_pkt_queue.c b/platform/linux-generic/odp_pkt_queue.c
index 010856f28..edc82803b 100644
--- a/platform/linux-generic/odp_pkt_queue.c
+++ b/platform/linux-generic/odp_pkt_queue.c
@@ -6,8 +6,6 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include "config.h"
-
 #include <stdint.h>
 #include <string.h>
 #include <malloc.h>
diff --git a/platform/linux-generic/odp_pktio_api.c b/platform/linux-generic/odp_pktio_api.c
index 16c30743c..42c75f84a 100644
--- a/platform/linux-generic/odp_pktio_api.c
+++ b/platform/linux-generic/odp_pktio_api.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/packet_io.h>
/* Include non-inlined versions of API functions */
diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c
index f021d903d..67b1e7fb9 100644
--- a/platform/linux-generic/odp_pool.c
+++ b/platform/linux-generic/odp_pool.c
@@ -5,8 +5,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/pool.h>
 #include <odp/api/shared_memory.h>
 #include <odp/api/align.h>
diff --git a/platform/linux-generic/odp_queue_api.c b/platform/linux-generic/odp_queue_api.c
index 343118573..495cf8746 100644
--- a/platform/linux-generic/odp_queue_api.c
+++ b/platform/linux-generic/odp_queue_api.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/queue.h>
/* Non-inlined functions for ABI compat mode */
diff --git a/platform/linux-generic/odp_queue_basic.c b/platform/linux-generic/odp_queue_basic.c
index 4ec564d69..73749c66a 100644
--- a/platform/linux-generic/odp_queue_basic.c
+++ b/platform/linux-generic/odp_queue_basic.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/queue.h>
 #include <odp_queue_basic_internal.h>
 #include <odp_queue_if.h>
diff --git a/platform/linux-generic/odp_queue_if.c b/platform/linux-generic/odp_queue_if.c
index 5ff8bbac5..f9df5c763 100644
--- a/platform/linux-generic/odp_queue_if.c
+++ b/platform/linux-generic/odp_queue_if.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
+#include <odp/config.h>
#include <odp_queue_if.h>
 #include <odp_init_internal.h>
diff --git a/platform/linux-generic/odp_queue_lf.c b/platform/linux-generic/odp_queue_lf.c
index 3e156a086..5f8c55e36 100644
--- a/platform/linux-generic/odp_queue_lf.c
+++ b/platform/linux-generic/odp_queue_lf.c
@@ -12,7 +12,6 @@
 #include <string.h>
 #include <stdio.h>
-#include "config.h"
 #include <odp_debug_internal.h>
#define RING_LF_SIZE   32
diff --git a/platform/linux-generic/odp_queue_scalable.c b/platform/linux-generic/odp_queue_scalable.c
index 862122123..6095e3cd6 100644
--- a/platform/linux-generic/odp_queue_scalable.c
+++ b/platform/linux-generic/odp_queue_scalable.c
@@ -5,7 +5,6 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <config.h>
#include <odp/api/hints.h>
 #include <odp/api/ticketlock.h>
diff --git a/platform/linux-generic/odp_queue_spsc.c b/platform/linux-generic/odp_queue_spsc.c
index 002561a49..8bf2c3ddc 100644
--- a/platform/linux-generic/odp_queue_spsc.c
+++ b/platform/linux-generic/odp_queue_spsc.c
@@ -9,7 +9,6 @@
 #include <odp_queue_basic_internal.h>
 #include <odp_pool_internal.h>
-#include "config.h"
 #include <odp_debug_internal.h>
static inline void buffer_index_from_buf(uint32_t buffer_index[],
diff --git a/platform/linux-generic/odp_random_null.c b/platform/linux-generic/odp_random_null.c
index d8ed78fea..2cedde3f8 100644
--- a/platform/linux-generic/odp_random_null.c
+++ b/platform/linux-generic/odp_random_null.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_posix_extensions.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/platform/linux-generic/odp_random_openssl.c b/platform/linux-generic/odp_random_openssl.c
index 9c3006c6d..bf1a329e5 100644
--- a/platform/linux-generic/odp_random_openssl.c
+++ b/platform/linux-generic/odp_random_openssl.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_posix_extensions.h>
 #include <stdint.h>
 #include <odp/api/random.h>
diff --git a/platform/linux-generic/odp_rwlock.c b/platform/linux-generic/odp_rwlock.c
index e027a23b5..74f5307aa 100644
--- a/platform/linux-generic/odp_rwlock.c
+++ b/platform/linux-generic/odp_rwlock.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <stdbool.h>
 #include <odp/api/atomic.h>
 #include <odp/api/rwlock.h>
diff --git a/platform/linux-generic/odp_rwlock_recursive.c b/platform/linux-generic/odp_rwlock_recursive.c
index dac9ad196..d7bbf3c8b 100644
--- a/platform/linux-generic/odp_rwlock_recursive.c
+++ b/platform/linux-generic/odp_rwlock_recursive.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/rwlock_recursive.h>
 #include <odp/api/thread.h>
 #include <odp/api/plat/thread_inlines.h>
diff --git a/platform/linux-generic/odp_schedule_basic.c b/platform/linux-generic/odp_schedule_basic.c
index b814c09cc..9908dd1c7 100644
--- a/platform/linux-generic/odp_schedule_basic.c
+++ b/platform/linux-generic/odp_schedule_basic.c
@@ -5,9 +5,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
-#include <string.h>
 #include <odp/api/schedule.h>
 #include <odp_schedule_if.h>
 #include <odp/api/align.h>
@@ -31,6 +28,8 @@
 #include <odp_libconfig_internal.h>
 #include <odp/api/plat/queue_inlines.h>
+#include <string.h>
+
 /* No synchronization context */
 #define NO_SYNC_CONTEXT ODP_SCHED_SYNC_PARALLEL
diff --git a/platform/linux-generic/odp_schedule_if.c b/platform/linux-generic/odp_schedule_if.c
index ba903e581..083950844 100644
--- a/platform/linux-generic/odp_schedule_if.c
+++ b/platform/linux-generic/odp_schedule_if.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
+#include <odp/config.h>
#include <odp_schedule_if.h>
 #include <odp_init_internal.h>
diff --git a/platform/linux-generic/odp_schedule_scalable.c b/platform/linux-generic/odp_schedule_scalable.c
index df8fee552..e993f2963 100644
--- a/platform/linux-generic/odp_schedule_scalable.c
+++ b/platform/linux-generic/odp_schedule_scalable.c
@@ -5,7 +5,6 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <config.h>
#include <odp/api/align.h>
 #include <odp/api/atomic.h>
diff --git a/platform/linux-generic/odp_schedule_scalable_ordered.c b/platform/linux-generic/odp_schedule_scalable_ordered.c
index e01120f1d..c70b225a8 100644
--- a/platform/linux-generic/odp_schedule_scalable_ordered.c
+++ b/platform/linux-generic/odp_schedule_scalable_ordered.c
@@ -5,7 +5,6 @@
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include <config.h>
#include <odp/api/shared_memory.h>
 #include <odp/api/cpu.h>
diff --git a/platform/linux-generic/odp_schedule_sp.c b/platform/linux-generic/odp_schedule_sp.c
index a47899208..b65dc6cb8 100644
--- a/platform/linux-generic/odp_schedule_sp.c
+++ b/platform/linux-generic/odp_schedule_sp.c
@@ -5,9 +5,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
-#include <string.h>
 #include <odp/api/ticketlock.h>
 #include <odp/api/thread.h>
 #include <odp/api/plat/thread_inlines.h>
@@ -23,6 +20,8 @@
 #include <odp_timer_internal.h>
 #include <odp_queue_basic_internal.h>
+#include <string.h>
+
 #define NUM_THREAD        ODP_THREAD_COUNT_MAX
 #define NUM_QUEUE         CONFIG_MAX_SCHED_QUEUES
 #define NUM_PKTIO         ODP_CONFIG_PKTIO_ENTRIES
diff --git a/platform/linux-generic/odp_shared_memory.c b/platform/linux-generic/odp_shared_memory.c
index d92b22587..ee47b7e96 100644
--- a/platform/linux-generic/odp_shared_memory.c
+++ b/platform/linux-generic/odp_shared_memory.c
@@ -5,8 +5,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_config_internal.h>
 #include <odp/api/debug.h>
 #include <odp/api/std_types.h>
diff --git a/platform/linux-generic/odp_sorted_list.c b/platform/linux-generic/odp_sorted_list.c
index e17f93840..042818c83 100644
--- a/platform/linux-generic/odp_sorted_list.c
+++ b/platform/linux-generic/odp_sorted_list.c
@@ -6,8 +6,6 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include "config.h"
-
 #include <stdint.h>
 #include <string.h>
 #include <malloc.h>
diff --git a/platform/linux-generic/odp_spinlock.c b/platform/linux-generic/odp_spinlock.c
index 54b7c713b..b38cc6a3a 100644
--- a/platform/linux-generic/odp_spinlock.c
+++ b/platform/linux-generic/odp_spinlock.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/spinlock.h>
 #include <odp/api/cpu.h>
 #include <odp_atomic_internal.h>
diff --git a/platform/linux-generic/odp_spinlock_recursive.c b/platform/linux-generic/odp_spinlock_recursive.c
index 593742685..6363a3838 100644
--- a/platform/linux-generic/odp_spinlock_recursive.c
+++ b/platform/linux-generic/odp_spinlock_recursive.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/spinlock_recursive.h>
 #include <odp/api/thread.h>
 #include <odp/api/plat/thread_inlines.h>
diff --git a/platform/linux-generic/odp_std_clib_api.c b/platform/linux-generic/odp_std_clib_api.c
index faa378473..a0ba25ae8 100644
--- a/platform/linux-generic/odp_std_clib_api.c
+++ b/platform/linux-generic/odp_std_clib_api.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/std_clib.h>
/* Include non-inlined versions of API functions */
diff --git a/platform/linux-generic/odp_sync_api.c b/platform/linux-generic/odp_sync_api.c
index 6e91209a8..56c86db14 100644
--- a/platform/linux-generic/odp_sync_api.c
+++ b/platform/linux-generic/odp_sync_api.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/sync.h>
/* Include non-inlined versions of API functions */
diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c
index a7a78d27f..028ef8668 100644
--- a/platform/linux-generic/odp_system_info.c
+++ b/platform/linux-generic/odp_system_info.c
@@ -11,8 +11,6 @@
  *   All rights reserved.
  */
-#include "config.h"
-
 #include <odp_posix_extensions.h>
#include <odp/api/system_info.h>
diff --git a/platform/linux-generic/odp_thread.c b/platform/linux-generic/odp_thread.c
index b30174dde..0ff0dc821 100644
--- a/platform/linux-generic/odp_thread.c
+++ b/platform/linux-generic/odp_thread.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_posix_extensions.h>
#include <sched.h>
diff --git a/platform/linux-generic/odp_thread_api.c b/platform/linux-generic/odp_thread_api.c
index cfce705dd..470a82de7 100644
--- a/platform/linux-generic/odp_thread_api.c
+++ b/platform/linux-generic/odp_thread_api.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/thread.h>
 #include <odp/api/cpu.h>
diff --git a/platform/linux-generic/odp_thrmask.c b/platform/linux-generic/odp_thrmask.c
index 51986805c..f8704a0dd 100644
--- a/platform/linux-generic/odp_thrmask.c
+++ b/platform/linux-generic/odp_thrmask.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/thrmask.h>
 #include <odp/api/cpumask.h>
diff --git a/platform/linux-generic/odp_ticketlock_api.c b/platform/linux-generic/odp_ticketlock_api.c
index ebbb8657e..8995dd555 100644
--- a/platform/linux-generic/odp_ticketlock_api.c
+++ b/platform/linux-generic/odp_ticketlock_api.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/ticketlock.h>
 #include <odp/api/plat/atomic_inlines.h>
diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c
index 97886d6a5..87ee6adc9 100644
--- a/platform/linux-generic/odp_time.c
+++ b/platform/linux-generic/odp_time.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_posix_extensions.h>
#include <time.h>
diff --git a/platform/linux-generic/odp_time_api.c b/platform/linux-generic/odp_time_api.c
index cd547b238..d906e14b8 100644
--- a/platform/linux-generic/odp_time_api.c
+++ b/platform/linux-generic/odp_time_api.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/time.h>
/* Non-inlined functions for ABI compat mode */
diff --git a/platform/linux-generic/odp_timer.c b/platform/linux-generic/odp_timer.c
index e55c68873..3b9200c4d 100644
--- a/platform/linux-generic/odp_timer.c
+++ b/platform/linux-generic/odp_timer.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 /**
  * @file
  *
diff --git a/platform/linux-generic/odp_timer_wheel.c b/platform/linux-generic/odp_timer_wheel.c
index 0320103d7..84640d215 100644
--- a/platform/linux-generic/odp_timer_wheel.c
+++ b/platform/linux-generic/odp_timer_wheel.c
@@ -6,8 +6,6 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include "config.h"
-
 #include <stdint.h>
 #include <string.h>
 #include <malloc.h>
diff --git a/platform/linux-generic/odp_traffic_mngr.c b/platform/linux-generic/odp_traffic_mngr.c
index 19fdd7797..9d19ac3c2 100644
--- a/platform/linux-generic/odp_traffic_mngr.c
+++ b/platform/linux-generic/odp_traffic_mngr.c
@@ -6,7 +6,6 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include "config.h"
 #include <odp_posix_extensions.h>
#include <stdint.h>
diff --git a/platform/linux-generic/odp_version.c b/platform/linux-generic/odp_version.c
index d46fddba6..baa336839 100644
--- a/platform/linux-generic/odp_version.c
+++ b/platform/linux-generic/odp_version.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.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 6632707f6..9e1c9da6a 100644
--- a/platform/linux-generic/odp_weak.c
+++ b/platform/linux-generic/odp_weak.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp/api/debug.h>
 #include <odp_debug_internal.h>
 #include <odp/api/hints.h>
diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c
index 77e42b094..23fae748b 100644
--- a/platform/linux-generic/pktio/dpdk.c
+++ b/platform/linux-generic/pktio/dpdk.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
+#include <odp/config.h>
#ifdef ODP_PKTIO_DPDK
diff --git a/platform/linux-generic/pktio/dpdk_parse.c b/platform/linux-generic/pktio/dpdk_parse.c
index 5f2b31d08..3dee44b87 100644
--- a/platform/linux-generic/pktio/dpdk_parse.c
+++ b/platform/linux-generic/pktio/dpdk_parse.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
+#include <odp/config.h>
#ifdef ODP_PKTIO_DPDK
diff --git a/platform/linux-generic/pktio/ethtool_rss.c b/platform/linux-generic/pktio/ethtool_rss.c
index 1ad9c970f..b66a385b9 100644
--- a/platform/linux-generic/pktio/ethtool_rss.c
+++ b/platform/linux-generic/pktio/ethtool_rss.c
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
 #include <odp_posix_extensions.h>
#include <stdio.h>
diff --git a/platform/linux-generic/pktio/io_ops.c b/platform/linux-generic/pktio/io_ops.c
index ae3daa661..e183058d8 100644
--- a/platform/linux-generic/pktio/io_ops.c
+++ b/platform/linux-generic/pktio/io_ops.c
@@ -4,8 +4,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
+#include <odp/config.h>
 #include <odp_packet_io_internal.h>
/* Ops for all implementation of pktio.
diff --git a/platform/linux-generic/pktio/ipc.c b/platform/linux-generic/pktio/ipc.c
index cd438ad3d..45d95bc11 100644
--- a/platform/linux-generic/pktio/ipc.c
+++ b/platform/linux-generic/pktio/ipc.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_packet_io_ipc_internal.h>
 #include <odp_debug_internal.h>
 #include <odp_packet_io_internal.h>
diff --git a/platform/linux-generic/pktio/loop.c b/platform/linux-generic/pktio/loop.c
index 206f43f6c..9dc6b5f94 100644
--- a/platform/linux-generic/pktio/loop.c
+++ b/platform/linux-generic/pktio/loop.c
@@ -5,8 +5,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include <odp_packet_internal.h>
 #include <odp_packet_io_internal.h>
diff --git a/platform/linux-generic/pktio/netmap.c b/platform/linux-generic/pktio/netmap.c
index 8b38c08db..9767de2f2 100644
--- a/platform/linux-generic/pktio/netmap.c
+++ b/platform/linux-generic/pktio/netmap.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
+#include <odp/config.h>
#ifdef ODP_NETMAP
diff --git a/platform/linux-generic/pktio/null.c b/platform/linux-generic/pktio/null.c
index 2f1757b6c..bb7f85c9b 100644
--- a/platform/linux-generic/pktio/null.c
+++ b/platform/linux-generic/pktio/null.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include <odp_packet_io_internal.h>
diff --git a/platform/linux-generic/pktio/pcap.c b/platform/linux-generic/pktio/pcap.c
index 9f7834033..e5709e5fb 100644
--- a/platform/linux-generic/pktio/pcap.c
+++ b/platform/linux-generic/pktio/pcap.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 /**
  * @file
  *
diff --git a/platform/linux-generic/pktio/pktio_common.c b/platform/linux-generic/pktio/pktio_common.c
index f0abadd1b..b19a6f647 100644
--- a/platform/linux-generic/pktio/pktio_common.c
+++ b/platform/linux-generic/pktio/pktio_common.c
@@ -5,8 +5,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_packet_io_internal.h>
 #include <errno.h>
diff --git a/platform/linux-generic/pktio/ring.c b/platform/linux-generic/pktio/ring.c
index 2cf0231cd..903e2c9f1 100644
--- a/platform/linux-generic/pktio/ring.c
+++ b/platform/linux-generic/pktio/ring.c
@@ -69,8 +69,6 @@
  *
  ***************************************************************************/
-#include "config.h"
-
 #include <odp_api.h>
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/platform/linux-generic/pktio/socket.c b/platform/linux-generic/pktio/socket.c
index 7e195580c..e7e0971c9 100644
--- a/platform/linux-generic/pktio/socket.c
+++ b/platform/linux-generic/pktio/socket.c
@@ -5,8 +5,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_posix_extensions.h>
#include <sys/socket.h>
diff --git a/platform/linux-generic/pktio/socket_common.c b/platform/linux-generic/pktio/socket_common.c
index 7dbba6d27..4fbf2f041 100644
--- a/platform/linux-generic/pktio/socket_common.c
+++ b/platform/linux-generic/pktio/socket_common.c
@@ -4,7 +4,7 @@
  *
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
+
 #include <odp_posix_extensions.h>
#include <stdio.h>
diff --git a/platform/linux-generic/pktio/socket_mmap.c b/platform/linux-generic/pktio/socket_mmap.c
index 6535bc72c..17bebe9a0 100644
--- a/platform/linux-generic/pktio/socket_mmap.c
+++ b/platform/linux-generic/pktio/socket_mmap.c
@@ -5,7 +5,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
#include <odp_posix_extensions.h>
diff --git a/platform/linux-generic/pktio/stats/ethtool_stats.c b/platform/linux-generic/pktio/stats/ethtool_stats.c
index bfc2a60ca..1ac3f6db2 100644
--- a/platform/linux-generic/pktio/stats/ethtool_stats.c
+++ b/platform/linux-generic/pktio/stats/ethtool_stats.c
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
 #include <odp_posix_extensions.h>
#include <sys/ioctl.h>
diff --git a/platform/linux-generic/pktio/stats/packet_io_stats.c b/platform/linux-generic/pktio/stats/packet_io_stats.c
index be87b5191..abeec0799 100644
--- a/platform/linux-generic/pktio/stats/packet_io_stats.c
+++ b/platform/linux-generic/pktio/stats/packet_io_stats.c
@@ -4,13 +4,12 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
-#include <string.h>
 #include <odp_packet_io_stats.h>
 #include <odp_ethtool_stats.h>
 #include <odp_sysfs_stats.h>
+#include <string.h>
+
 int sock_stats_reset_fd(pktio_entry_t *pktio_entry, int fd)
 {
    int err = 0;
diff --git a/platform/linux-generic/pktio/stats/sysfs_stats.c b/platform/linux-generic/pktio/stats/sysfs_stats.c
index e5fa55442..2de2bb131 100644
--- a/platform/linux-generic/pktio/stats/sysfs_stats.c
+++ b/platform/linux-generic/pktio/stats/sysfs_stats.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include <odp_sysfs_stats.h>
 #include <odp_errno_define.h>
diff --git a/platform/linux-generic/pktio/tap.c b/platform/linux-generic/pktio/tap.c
index 19067969f..638edec94 100644
--- a/platform/linux-generic/pktio/tap.c
+++ b/platform/linux-generic/pktio/tap.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 /**
  * @file
  *
diff --git a/platform/linux-generic/test/ring/ring_main.c b/platform/linux-generic/test/ring/ring_main.c
index 9b08b634d..8d0f07527 100644
--- a/platform/linux-generic/test/ring/ring_main.c
+++ b/platform/linux-generic/test/ring/ring_main.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include "ring_suites.h"
int main(int argc, char *argv[])
diff --git a/platform/linux-generic/test/validation/api/shmem/shmem_linux.c b/platform/linux-generic/test/validation/api/shmem/shmem_linux.c
index 6b09c1dea..43a640c49 100644
--- a/platform/linux-generic/test/validation/api/shmem/shmem_linux.c
+++ b/platform/linux-generic/test/validation/api/shmem/shmem_linux.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 /* this test makes sure that odp shared memory created with the ODP_SHM_PROC
  * flag is visible under linux, and checks that memory created with the
  * ODP_SHM_EXPORT flag is visible by other ODP instances.
diff --git a/platform/linux-generic/test/validation/api/shmem/shmem_odp1.c b/platform/linux-generic/test/validation/api/shmem/shmem_odp1.c
index d44e94c3e..ca28c805c 100644
--- a/platform/linux-generic/test/validation/api/shmem/shmem_odp1.c
+++ b/platform/linux-generic/test/validation/api/shmem/shmem_odp1.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp.h>
 #include <linux/limits.h>
 #include <sys/types.h>
diff --git a/platform/linux-generic/test/validation/api/shmem/shmem_odp2.c b/platform/linux-generic/test/validation/api/shmem/shmem_odp2.c
index 7573644c9..2aaa70ac2 100644
--- a/platform/linux-generic/test/validation/api/shmem/shmem_odp2.c
+++ b/platform/linux-generic/test/validation/api/shmem/shmem_odp2.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp.h>
 #include <linux/limits.h>
 #include <sys/types.h>
diff --git a/test/common/mask_common.c b/test/common/mask_common.c
index aa003119d..3b6b44102 100644
--- a/test/common/mask_common.c
+++ b/test/common/mask_common.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
#include "odp_cunit_common.h"
diff --git a/test/performance/odp_crypto.c b/test/performance/odp_crypto.c
index 665268be0..ded97c03e 100644
--- a/test/performance/odp_crypto.c
+++ b/test/performance/odp_crypto.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
-#include "config.h"
-
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif /* _GNU_SOURCE */
diff --git a/test/performance/odp_ipsec.c b/test/performance/odp_ipsec.c
index e388916c4..efdef0749 100644
--- a/test/performance/odp_ipsec.c
+++ b/test/performance/odp_ipsec.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
-#include "config.h"
-
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif /* _GNU_SOURCE */
diff --git a/test/validation/api/atomic/atomic.c b/test/validation/api/atomic/atomic.c
index 9530df9ca..914e0257e 100644
--- a/test/validation/api/atomic/atomic.c
+++ b/test/validation/api/atomic/atomic.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:	 BSD-3-Clause
  */
-#include "config.h"
-
 #include <malloc.h>
 #include <odp_api.h>
 #include <odp/helper/odph_api.h>
diff --git a/test/validation/api/barrier/barrier.c b/test/validation/api/barrier/barrier.c
index 806f2486a..c03151765 100644
--- a/test/validation/api/barrier/barrier.c
+++ b/test/validation/api/barrier/barrier.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:	 BSD-3-Clause
  */
-#include "config.h"
-
 #include <malloc.h>
 #include <odp_api.h>
 #include <odp/helper/odph_api.h>
diff --git a/test/validation/api/buffer/buffer.c b/test/validation/api/buffer/buffer.c
index 9f2049034..2d665279a 100644
--- a/test/validation/api/buffer/buffer.c
+++ b/test/validation/api/buffer/buffer.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include "odp_cunit_common.h"
diff --git a/test/validation/api/classification/classification.c b/test/validation/api/classification/classification.c
index d4285411f..59d9ec00e 100644
--- a/test/validation/api/classification/classification.c
+++ b/test/validation/api/classification/classification.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include <odp_cunit_common.h>
 #include "odp_classification_testsuites.h"
diff --git a/test/validation/api/classification/odp_classification_basic.c b/test/validation/api/classification/odp_classification_basic.c
index 8a4e21d3c..c001445e7 100644
--- a/test/validation/api/classification/odp_classification_basic.c
+++ b/test/validation/api/classification/odp_classification_basic.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_cunit_common.h>
 #include "odp_classification_testsuites.h"
 #include "classification.h"
diff --git a/test/validation/api/classification/odp_classification_test_pmr.c b/test/validation/api/classification/odp_classification_test_pmr.c
index 55a86f5bc..bdf9ccf45 100644
--- a/test/validation/api/classification/odp_classification_test_pmr.c
+++ b/test/validation/api/classification/odp_classification_test_pmr.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
-#include "config.h"
-
 #include "odp_classification_testsuites.h"
 #include "classification.h"
 #include <odp_cunit_common.h>
diff --git a/test/validation/api/classification/odp_classification_tests.c b/test/validation/api/classification/odp_classification_tests.c
index 3951d8bed..c58f5e68f 100644
--- a/test/validation/api/classification/odp_classification_tests.c
+++ b/test/validation/api/classification/odp_classification_tests.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
-#include "config.h"
-
 #include "odp_classification_testsuites.h"
 #include "classification.h"
 #include <odp_cunit_common.h>
diff --git a/test/validation/api/comp/comp.c b/test/validation/api/comp/comp.c
index e84764f71..490d5577e 100644
--- a/test/validation/api/comp/comp.c
+++ b/test/validation/api/comp/comp.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include <odp_cunit_common.h>
 #include "test_vectors.h"
diff --git a/test/validation/api/cpumask/cpumask.c b/test/validation/api/cpumask/cpumask.c
index a67a81a27..eb131a142 100644
--- a/test/validation/api/cpumask/cpumask.c
+++ b/test/validation/api/cpumask/cpumask.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
#include "odp_cunit_common.h"
diff --git a/test/validation/api/crypto/odp_crypto_test_inp.c b/test/validation/api/crypto/odp_crypto_test_inp.c
index faf4dba83..f0aa366cb 100644
--- a/test/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/validation/api/crypto/odp_crypto_test_inp.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include <odp/helper/odph_api.h>
 #include <CUnit/Basic.h>
diff --git a/test/validation/api/errno/errno.c b/test/validation/api/errno/errno.c
index e407382e6..ed2ab391d 100644
--- a/test/validation/api/errno/errno.c
+++ b/test/validation/api/errno/errno.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include "odp_cunit_common.h"
diff --git a/test/validation/api/event/event.c b/test/validation/api/event/event.c
index 52ae4f67b..fbd360350 100644
--- a/test/validation/api/event/event.c
+++ b/test/validation/api/event/event.c
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
 #include <odp_api.h>
 #include <odp_cunit_common.h>
diff --git a/test/validation/api/hash/hash.c b/test/validation/api/hash/hash.c
index 4edcb08aa..b4f22d609 100644
--- a/test/validation/api/hash/hash.c
+++ b/test/validation/api/hash/hash.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include <odp_cunit_common.h>
diff --git a/test/validation/api/init/init_main.c b/test/validation/api/init/init_main.c
index 742f02522..6878d36db 100644
--- a/test/validation/api/init/init_main.c
+++ b/test/validation/api/init/init_main.c
@@ -5,8 +5,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include <odp_cunit_common.h>
diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index 1b17f082e..580190502 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -5,8 +5,6 @@
  * SPDX-License-Identifier:	 BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include <odp_cunit_common.h>
 #include <unistd.h>
diff --git a/test/validation/api/ipsec/ipsec_async.c b/test/validation/api/ipsec/ipsec_async.c
index 0e9797724..db5c0e58a 100644
--- a/test/validation/api/ipsec/ipsec_async.c
+++ b/test/validation/api/ipsec/ipsec_async.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include "ipsec.h"
static int ipsec_async_init(odp_instance_t *inst)
diff --git a/test/validation/api/ipsec/ipsec_inline_in.c b/test/validation/api/ipsec/ipsec_inline_in.c
index e2415d1bc..073922072 100644
--- a/test/validation/api/ipsec/ipsec_inline_in.c
+++ b/test/validation/api/ipsec/ipsec_inline_in.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include "ipsec.h"
static int ipsec_sync_init(odp_instance_t *inst)
diff --git a/test/validation/api/ipsec/ipsec_inline_out.c b/test/validation/api/ipsec/ipsec_inline_out.c
index a9d1e222e..d799ca34d 100644
--- a/test/validation/api/ipsec/ipsec_inline_out.c
+++ b/test/validation/api/ipsec/ipsec_inline_out.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include "ipsec.h"
static int ipsec_sync_init(odp_instance_t *inst)
diff --git a/test/validation/api/ipsec/ipsec_sync.c b/test/validation/api/ipsec/ipsec_sync.c
index 49c596018..1c41ec7d1 100644
--- a/test/validation/api/ipsec/ipsec_sync.c
+++ b/test/validation/api/ipsec/ipsec_sync.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include "ipsec.h"
static int ipsec_sync_init(odp_instance_t *inst)
diff --git a/test/validation/api/ipsec/ipsec_test_in.c b/test/validation/api/ipsec/ipsec_test_in.c
index 515331483..0e23c3681 100644
--- a/test/validation/api/ipsec/ipsec_test_in.c
+++ b/test/validation/api/ipsec/ipsec_test_in.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include "ipsec.h"
#include "test_vectors.h"
diff --git a/test/validation/api/ipsec/ipsec_test_out.c b/test/validation/api/ipsec/ipsec_test_out.c
index ee3fd43fb..48a6b80cd 100644
--- a/test/validation/api/ipsec/ipsec_test_out.c
+++ b/test/validation/api/ipsec/ipsec_test_out.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include "ipsec.h"
#include "test_vectors.h"
diff --git a/test/validation/api/lock/lock.c b/test/validation/api/lock/lock.c
index b8502f011..33698d6ef 100644
--- a/test/validation/api/lock/lock.c
+++ b/test/validation/api/lock/lock.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:	 BSD-3-Clause
  */
-#include "config.h"
-
 #include <malloc.h>
 #include <odp_api.h>
 #include <odp/helper/odph_api.h>
diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c
index 352fa62c9..a12ad13eb 100644
--- a/test/validation/api/packet/packet.c
+++ b/test/validation/api/packet/packet.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
-#include "config.h"
-
 #include <stdlib.h>
#include <odp_api.h>
diff --git a/test/validation/api/pktio/parser.c b/test/validation/api/pktio/parser.c
index db37c1c5b..e23e7d0c4 100644
--- a/test/validation/api/pktio/parser.c
+++ b/test/validation/api/pktio/parser.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include <odp_cunit_common.h>
 #include <test_packet_parser.h>
diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c
index ae7ccbb6b..f035b8cd4 100644
--- a/test/validation/api/pktio/pktio.c
+++ b/test/validation/api/pktio/pktio.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include <odp_cunit_common.h>
diff --git a/test/validation/api/pool/pool.c b/test/validation/api/pool/pool.c
index c3def1b05..ec1b2ff5d 100644
--- a/test/validation/api/pool/pool.c
+++ b/test/validation/api/pool/pool.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include "odp_cunit_common.h"
diff --git a/test/validation/api/queue/queue.c b/test/validation/api/queue/queue.c
index b58ccfb15..807ca5291 100644
--- a/test/validation/api/queue/queue.c
+++ b/test/validation/api/queue/queue.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include <odp_cunit_common.h>
diff --git a/test/validation/api/random/random.c b/test/validation/api/random/random.c
index 9026ba9a8..cf7163e2d 100644
--- a/test/validation/api/random/random.c
+++ b/test/validation/api/random/random.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include <odp_cunit_common.h>
diff --git a/test/validation/api/scheduler/scheduler.c b/test/validation/api/scheduler/scheduler.c
index bcee0d193..6332302b9 100644
--- a/test/validation/api/scheduler/scheduler.c
+++ b/test/validation/api/scheduler/scheduler.c
@@ -5,8 +5,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include "odp_cunit_common.h"
 #include <odp/helper/odph_api.h>
diff --git a/test/validation/api/shmem/shmem.c b/test/validation/api/shmem/shmem.c
index 4e2c13a22..c5a161319 100644
--- a/test/validation/api/shmem/shmem.c
+++ b/test/validation/api/shmem/shmem.c
@@ -5,8 +5,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include <odp_cunit_common.h>
 #include <stdlib.h>
diff --git a/test/validation/api/std_clib/std_clib.c b/test/validation/api/std_clib/std_clib.c
index ccae54127..35ad6f92b 100644
--- a/test/validation/api/std_clib/std_clib.c
+++ b/test/validation/api/std_clib/std_clib.c
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
-#include "config.h"
-
 #include <odp_api.h>
 #include <odp_cunit_common.h>
diff --git a/test/validation/api/time/time.c b/test/validation/api/time/time.c
index 2113c5461..3add81976 100644
--- a/test/validation/api/time/time.c
+++ b/test/validation/api/time/time.c
@@ -4,11 +4,14 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include "config.h"
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
+#include <time.h>
#include <odp_api.h>
 #include "odp_cunit_common.h"
-#include <time.h>
#define BUSY_LOOP_CNT		30000000    /* used for t > min resolution */
 #define BUSY_LOOP_CNT_LONG	6000000000  /* used for t > 4 sec */
-----------------------------------------------------------------------
Summary of changes:
 .gitignore                                                       | 4 ++--
 configure.ac                                                     | 2 +-
 helper/chksum.c                                                  | 2 --
 helper/cuckootable.c                                             | 2 --
 helper/eth.c                                                     | 2 --
 helper/hashtable.c                                               | 2 --
 helper/include/odp/helper/odph_debug.h                           | 2 +-
 helper/ip.c                                                      | 2 --
 helper/iplookuptable.c                                           | 2 --
 helper/lineartable.c                                             | 2 --
 helper/linux/thread.c                                            | 2 --
 helper/test/chksum.c                                             | 2 --
 helper/test/cuckootable.c                                        | 2 --
 helper/test/debug.c                                              | 2 +-
 helper/test/iplookuptable.c                                      | 2 --
 helper/test/linux/process.c                                      | 2 --
 helper/test/linux/pthread.c                                      | 2 --
 helper/test/odpthreads.c                                         | 2 --
 helper/test/parse.c                                              | 2 --
 helper/test/table.c                                              | 2 --
 helper/test/version.c                                            | 2 --
 helper/threads.c                                                 | 2 --
 include/Makefile.am                                              | 1 +
 platform/linux-generic/arch/aarch64/odp_global_time.c            | 2 --
 platform/linux-generic/arch/aarch64/odp_sysinfo_parse.c          | 1 -
 platform/linux-generic/arch/default/odp_cpu_cycles.c             | 2 --
 platform/linux-generic/arch/default/odp_sysinfo_parse.c          | 2 --
 platform/linux-generic/arch/mips64/odp_cpu_cycles.c              | 2 --
 platform/linux-generic/arch/mips64/odp_sysinfo_parse.c           | 2 --
 platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c          | 2 --
 platform/linux-generic/arch/x86/cpu_flags.c                      | 2 --
 platform/linux-generic/arch/x86/odp_global_time.c                | 2 --
 platform/linux-generic/arch/x86/odp_sysinfo_parse.c              | 2 --
 platform/linux-generic/include/odp_debug_internal.h              | 7 +++++--
 platform/linux-generic/include/odp_packet_io_internal.h          | 3 +++
 platform/linux-generic/include/odp_schedule_if.h                 | 2 --
 platform/linux-generic/odp_atomic.c                              | 2 --
 platform/linux-generic/odp_atomic_api.c                          | 2 --
 platform/linux-generic/odp_barrier.c                             | 2 --
 platform/linux-generic/odp_bitmap.c                              | 2 --
 platform/linux-generic/odp_buffer.c                              | 2 --
 platform/linux-generic/odp_byteorder_api.c                       | 2 --
 platform/linux-generic/odp_classification.c                      | 2 --
 platform/linux-generic/odp_comp.c                                | 1 -
 platform/linux-generic/odp_cpu_api.c                             | 2 --
 platform/linux-generic/odp_cpumask.c                             | 2 --
 platform/linux-generic/odp_cpumask_task.c                        | 2 --
 platform/linux-generic/odp_crypto_null.c                         | 2 --
 platform/linux-generic/odp_crypto_openssl.c                      | 2 --
 platform/linux-generic/odp_errno.c                               | 2 --
 platform/linux-generic/odp_event.c                               | 2 --
 platform/linux-generic/odp_event_api.c                           | 2 --
 platform/linux-generic/odp_fdserver.c                            | 2 --
 platform/linux-generic/odp_hash_crc32c.c                         | 2 --
 platform/linux-generic/odp_impl.c                                | 2 +-
 platform/linux-generic/odp_init.c                                | 2 --
 platform/linux-generic/odp_ipsec.c                               | 2 --
 platform/linux-generic/odp_ipsec_events.c                        | 2 --
 platform/linux-generic/odp_ipsec_sad.c                           | 2 --
 platform/linux-generic/odp_ishm.c                                | 2 --
 platform/linux-generic/odp_ishmphy.c                             | 2 --
 platform/linux-generic/odp_ishmpool.c                            | 1 -
 platform/linux-generic/odp_libconfig.c                           | 2 --
 platform/linux-generic/odp_name_table.c                          | 2 --
 platform/linux-generic/odp_packet.c                              | 2 +-
 platform/linux-generic/odp_packet_api.c                          | 2 --
 platform/linux-generic/odp_packet_flags.c                        | 2 --
 platform/linux-generic/odp_packet_flags_api.c                    | 2 --
 platform/linux-generic/odp_packet_io.c                           | 3 +--
 platform/linux-generic/odp_pcapng.c                              | 2 +-
 platform/linux-generic/odp_pkt_queue.c                           | 2 --
 platform/linux-generic/odp_pktio_api.c                           | 2 --
 platform/linux-generic/odp_pool.c                                | 2 --
 platform/linux-generic/odp_queue_api.c                           | 2 --
 platform/linux-generic/odp_queue_basic.c                         | 2 --
 platform/linux-generic/odp_queue_if.c                            | 2 +-
 platform/linux-generic/odp_queue_lf.c                            | 1 -
 platform/linux-generic/odp_queue_scalable.c                      | 1 -
 platform/linux-generic/odp_queue_spsc.c                          | 1 -
 platform/linux-generic/odp_random_null.c                         | 2 --
 platform/linux-generic/odp_random_openssl.c                      | 2 --
 platform/linux-generic/odp_rwlock.c                              | 2 --
 platform/linux-generic/odp_rwlock_recursive.c                    | 2 --
 platform/linux-generic/odp_schedule_basic.c                      | 5 ++---
 platform/linux-generic/odp_schedule_if.c                         | 2 +-
 platform/linux-generic/odp_schedule_scalable.c                   | 1 -
 platform/linux-generic/odp_schedule_scalable_ordered.c           | 1 -
 platform/linux-generic/odp_schedule_sp.c                         | 5 ++---
 platform/linux-generic/odp_shared_memory.c                       | 2 --
 platform/linux-generic/odp_sorted_list.c                         | 2 --
 platform/linux-generic/odp_spinlock.c                            | 2 --
 platform/linux-generic/odp_spinlock_recursive.c                  | 2 --
 platform/linux-generic/odp_std_clib_api.c                        | 2 --
 platform/linux-generic/odp_sync_api.c                            | 2 --
 platform/linux-generic/odp_system_info.c                         | 2 --
 platform/linux-generic/odp_thread.c                              | 2 --
 platform/linux-generic/odp_thread_api.c                          | 2 --
 platform/linux-generic/odp_thrmask.c                             | 2 --
 platform/linux-generic/odp_ticketlock_api.c                      | 2 --
 platform/linux-generic/odp_time.c                                | 2 --
 platform/linux-generic/odp_time_api.c                            | 2 --
 platform/linux-generic/odp_timer.c                               | 2 --
 platform/linux-generic/odp_timer_wheel.c                         | 2 --
 platform/linux-generic/odp_traffic_mngr.c                        | 1 -
 platform/linux-generic/odp_version.c                             | 2 --
 platform/linux-generic/odp_weak.c                                | 2 --
 platform/linux-generic/pktio/dpdk.c                              | 2 +-
 platform/linux-generic/pktio/dpdk_parse.c                        | 2 +-
 platform/linux-generic/pktio/ethtool_rss.c                       | 1 -
 platform/linux-generic/pktio/io_ops.c                            | 3 +--
 platform/linux-generic/pktio/ipc.c                               | 2 --
 platform/linux-generic/pktio/loop.c                              | 2 --
 platform/linux-generic/pktio/netmap.c                            | 2 +-
 platform/linux-generic/pktio/null.c                              | 2 --
 platform/linux-generic/pktio/pcap.c                              | 2 --
 platform/linux-generic/pktio/pktio_common.c                      | 2 --
 platform/linux-generic/pktio/ring.c                              | 2 --
 platform/linux-generic/pktio/socket.c                            | 2 --
 platform/linux-generic/pktio/socket_common.c                     | 2 +-
 platform/linux-generic/pktio/socket_mmap.c                       | 1 -
 platform/linux-generic/pktio/stats/ethtool_stats.c               | 1 -
 platform/linux-generic/pktio/stats/packet_io_stats.c             | 5 ++---
 platform/linux-generic/pktio/stats/sysfs_stats.c                 | 2 --
 platform/linux-generic/pktio/tap.c                               | 2 --
 platform/linux-generic/test/ring/ring_main.c                     | 2 --
 platform/linux-generic/test/validation/api/shmem/shmem_linux.c   | 2 --
 platform/linux-generic/test/validation/api/shmem/shmem_odp1.c    | 2 --
 platform/linux-generic/test/validation/api/shmem/shmem_odp2.c    | 2 --
 test/common/mask_common.c                                        | 2 --
 test/performance/odp_crypto.c                                    | 2 --
 test/performance/odp_ipsec.c                                     | 2 --
 test/validation/api/atomic/atomic.c                              | 2 --
 test/validation/api/barrier/barrier.c                            | 2 --
 test/validation/api/buffer/buffer.c                              | 2 --
 test/validation/api/classification/classification.c              | 2 --
 test/validation/api/classification/odp_classification_basic.c    | 2 --
 test/validation/api/classification/odp_classification_test_pmr.c | 2 --
 test/validation/api/classification/odp_classification_tests.c    | 2 --
 test/validation/api/comp/comp.c                                  | 2 --
 test/validation/api/cpumask/cpumask.c                            | 2 --
 test/validation/api/crypto/odp_crypto_test_inp.c                 | 2 --
 test/validation/api/errno/errno.c                                | 2 --
 test/validation/api/event/event.c                                | 1 -
 test/validation/api/hash/hash.c                                  | 2 --
 test/validation/api/init/init_main.c                             | 2 --
 test/validation/api/ipsec/ipsec.c                                | 2 --
 test/validation/api/ipsec/ipsec_async.c                          | 2 --
 test/validation/api/ipsec/ipsec_inline_in.c                      | 2 --
 test/validation/api/ipsec/ipsec_inline_out.c                     | 2 --
 test/validation/api/ipsec/ipsec_sync.c                           | 2 --
 test/validation/api/ipsec/ipsec_test_in.c                        | 2 --
 test/validation/api/ipsec/ipsec_test_out.c                       | 2 --
 test/validation/api/lock/lock.c                                  | 2 --
 test/validation/api/packet/packet.c                              | 2 --
 test/validation/api/pktio/parser.c                               | 2 --
 test/validation/api/pktio/pktio.c                                | 2 --
 test/validation/api/pool/pool.c                                  | 2 --
 test/validation/api/queue/queue.c                                | 2 --
 test/validation/api/random/random.c                              | 2 --
 test/validation/api/scheduler/scheduler.c                        | 2 --
 test/validation/api/shmem/shmem.c                                | 2 --
 test/validation/api/std_clib/std_clib.c                          | 2 --
 test/validation/api/time/time.c                                  | 7 +++++--
 163 files changed, 36 insertions(+), 300 deletions(-)
hooks/post-receive
-- 


    