diff --git a/test/common_plat/common/mask_common.c b/test/common_plat/common/mask_common.c
index b31534c6..a4a1450c 100644
--- a/test/common_plat/common/mask_common.c
+++ b/test/common_plat/common/mask_common.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <odp_api.h>
 
 #include "odp_cunit_common.h"
diff --git a/test/common_plat/common/odp_cunit_common.c b/test/common_plat/common/odp_cunit_common.c
index d3328af6..fdd7631a 100644
--- a/test/common_plat/common/odp_cunit_common.c
+++ b/test/common_plat/common/odp_cunit_common.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h>
 #include <odp_api.h>
 #include <odp_cunit_common.h>
diff --git a/test/common_plat/performance/odp_bench_packet.c b/test/common_plat/performance/odp_bench_packet.c
index c4cd6139..e8e4e131 100644
--- a/test/common_plat/performance/odp_bench_packet.c
+++ b/test/common_plat/performance/odp_bench_packet.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /**
  * @file
  *
diff --git a/test/common_plat/performance/odp_crypto.c b/test/common_plat/performance/odp_crypto.c
index c3dd6d38..c42cbb92 100644
--- a/test/common_plat/performance/odp_crypto.c
+++ b/test/common_plat/performance/odp_crypto.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif /* _GNU_SOURCE */
diff --git a/test/common_plat/performance/odp_l2fwd.c b/test/common_plat/performance/odp_l2fwd.c
index 78b3633b..b20ecea2 100644
--- a/test/common_plat/performance/odp_l2fwd.c
+++ b/test/common_plat/performance/odp_l2fwd.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /**
  * @file
  *
diff --git a/test/common_plat/performance/odp_pktio_ordered.c b/test/common_plat/performance/odp_pktio_ordered.c
index 4bb0bef9..bb2e8990 100644
--- a/test/common_plat/performance/odp_pktio_ordered.c
+++ b/test/common_plat/performance/odp_pktio_ordered.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /**
  * @file
  *
diff --git a/test/common_plat/performance/odp_pktio_perf.c b/test/common_plat/performance/odp_pktio_perf.c
index 09463081..d3c43702 100644
--- a/test/common_plat/performance/odp_pktio_perf.c
+++ b/test/common_plat/performance/odp_pktio_perf.c
@@ -20,6 +20,10 @@
  * a single packet rate can be specified on the command line.
  *
  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <odp_api.h>
 
 #include <odp/helper/odph_api.h>
diff --git a/test/common_plat/performance/odp_sched_latency.c b/test/common_plat/performance/odp_sched_latency.c
index 026f2f6c..6f6b5da5 100644
--- a/test/common_plat/performance/odp_sched_latency.c
+++ b/test/common_plat/performance/odp_sched_latency.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /**
  * @file
  *
diff --git a/test/common_plat/performance/odp_scheduling.c b/test/common_plat/performance/odp_scheduling.c
index 38e76257..1188bf2f 100644
--- a/test/common_plat/performance/odp_scheduling.c
+++ b/test/common_plat/performance/odp_scheduling.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /**
  * @file
  *
diff --git a/test/common_plat/validation/api/atomic/atomic.c b/test/common_plat/validation/api/atomic/atomic.c
index db9484bc..ee9e5b20 100644
--- a/test/common_plat/validation/api/atomic/atomic.c
+++ b/test/common_plat/validation/api/atomic/atomic.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:	 BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <malloc.h>
 #include <odp_api.h>
 #include <CUnit/Basic.h>
diff --git a/test/common_plat/validation/api/atomic/atomic_main.c b/test/common_plat/validation/api/atomic/atomic_main.c
index db035373..f783996f 100644
--- a/test/common_plat/validation/api/atomic/atomic_main.c
+++ b/test/common_plat/validation/api/atomic/atomic_main.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "atomic.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/barrier/barrier.c b/test/common_plat/validation/api/barrier/barrier.c
index 79ee82b3..cda1a38f 100644
--- a/test/common_plat/validation/api/barrier/barrier.c
+++ b/test/common_plat/validation/api/barrier/barrier.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:	 BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <malloc.h>
 #include <odp_api.h>
 #include <CUnit/Basic.h>
diff --git a/test/common_plat/validation/api/barrier/barrier_main.c b/test/common_plat/validation/api/barrier/barrier_main.c
index 064decf6..6d9b3893 100644
--- a/test/common_plat/validation/api/barrier/barrier_main.c
+++ b/test/common_plat/validation/api/barrier/barrier_main.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "barrier.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/buffer/buffer.c b/test/common_plat/validation/api/buffer/buffer.c
index 7c723d4f..1a58b9f2 100644
--- a/test/common_plat/validation/api/buffer/buffer.c
+++ b/test/common_plat/validation/api/buffer/buffer.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <odp_api.h>
 #include "odp_cunit_common.h"
 #include "buffer.h"
diff --git a/test/common_plat/validation/api/buffer/buffer_main.c b/test/common_plat/validation/api/buffer/buffer_main.c
index 47168f8b..c5cc522e 100644
--- a/test/common_plat/validation/api/buffer/buffer_main.c
+++ b/test/common_plat/validation/api/buffer/buffer_main.c
@@ -3,6 +3,10 @@
  *
  * SPDX-License-Identifier:	BSD-3-Clause
  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "buffer.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/classification/classification.c b/test/common_plat/validation/api/classification/classification.c
index 1032e7f1..e96920b7 100644
--- a/test/common_plat/validation/api/classification/classification.c
+++ b/test/common_plat/validation/api/classification/classification.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <odp_api.h>
 #include <odp_cunit_common.h>
 #include "odp_classification_testsuites.h"
diff --git a/test/common_plat/validation/api/classification/classification_main.c b/test/common_plat/validation/api/classification/classification_main.c
index 8902463c..030b72ef 100644
--- a/test/common_plat/validation/api/classification/classification_main.c
+++ b/test/common_plat/validation/api/classification/classification_main.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "classification.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/classification/odp_classification_basic.c b/test/common_plat/validation/api/classification/odp_classification_basic.c
index 3f4a82ed..053d3d64 100644
--- a/test/common_plat/validation/api/classification/odp_classification_basic.c
+++ b/test/common_plat/validation/api/classification/odp_classification_basic.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <odp_cunit_common.h>
 #include "odp_classification_testsuites.h"
 #include "classification.h"
diff --git a/test/common_plat/validation/api/classification/odp_classification_common.c b/test/common_plat/validation/api/classification/odp_classification_common.c
index de8a9327..7198845f 100644
--- a/test/common_plat/validation/api/classification/odp_classification_common.c
+++ b/test/common_plat/validation/api/classification/odp_classification_common.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "odp_classification_testsuites.h"
 #include "classification.h"
 #include <odp_cunit_common.h>
diff --git a/test/common_plat/validation/api/classification/odp_classification_test_pmr.c b/test/common_plat/validation/api/classification/odp_classification_test_pmr.c
index e6b496a1..94bca10a 100644
--- a/test/common_plat/validation/api/classification/odp_classification_test_pmr.c
+++ b/test/common_plat/validation/api/classification/odp_classification_test_pmr.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "odp_classification_testsuites.h"
 #include "classification.h"
 #include <odp_cunit_common.h>
diff --git a/test/common_plat/validation/api/classification/odp_classification_tests.c b/test/common_plat/validation/api/classification/odp_classification_tests.c
index a0f73e39..33069653 100644
--- a/test/common_plat/validation/api/classification/odp_classification_tests.c
+++ b/test/common_plat/validation/api/classification/odp_classification_tests.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "odp_classification_testsuites.h"
 #include "classification.h"
 #include <odp_cunit_common.h>
diff --git a/test/common_plat/validation/api/cpumask/cpumask.c b/test/common_plat/validation/api/cpumask/cpumask.c
index a0cb559f..ceb68fd9 100644
--- a/test/common_plat/validation/api/cpumask/cpumask.c
+++ b/test/common_plat/validation/api/cpumask/cpumask.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <odp_api.h>
 
 #include "odp_cunit_common.h"
diff --git a/test/common_plat/validation/api/cpumask/cpumask_main.c b/test/common_plat/validation/api/cpumask/cpumask_main.c
index 39e3171c..1181b7e3 100644
--- a/test/common_plat/validation/api/cpumask/cpumask_main.c
+++ b/test/common_plat/validation/api/cpumask/cpumask_main.c
@@ -3,6 +3,10 @@
  *
  * SPDX-License-Identifier:     BSD-3-Clause
  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "cpumask.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/crypto/crypto.c b/test/common_plat/validation/api/crypto/crypto.c
index 94beb2f1..1955440a 100644
--- a/test/common_plat/validation/api/crypto/crypto.c
+++ b/test/common_plat/validation/api/crypto/crypto.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <odp_api.h>
 #include <odp_cunit_common.h>
 #include "odp_crypto_test_inp.h"
diff --git a/test/common_plat/validation/api/crypto/crypto_main.c b/test/common_plat/validation/api/crypto/crypto_main.c
index d8c26fa2..e6919623 100644
--- a/test/common_plat/validation/api/crypto/crypto_main.c
+++ b/test/common_plat/validation/api/crypto/crypto_main.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "crypto.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
index ae600e23..2729140c 100644
--- a/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
+++ b/test/common_plat/validation/api/crypto/odp_crypto_test_inp.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <odp_api.h>
 #include <CUnit/Basic.h>
 #include <odp_cunit_common.h>
diff --git a/test/common_plat/validation/api/errno/errno.c b/test/common_plat/validation/api/errno/errno.c
index e3b6ced5..5b9b80b0 100644
--- a/test/common_plat/validation/api/errno/errno.c
+++ b/test/common_plat/validation/api/errno/errno.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <odp_api.h>
 #include "odp_cunit_common.h"
 #include "errno.h"
diff --git a/test/common_plat/validation/api/errno/errno_main.c b/test/common_plat/validation/api/errno/errno_main.c
index 0138279e..6f4c2bd0 100644
--- a/test/common_plat/validation/api/errno/errno_main.c
+++ b/test/common_plat/validation/api/errno/errno_main.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "errno.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/hash/hash.c b/test/common_plat/validation/api/hash/hash.c
index b353fcec..5c35404c 100644
--- a/test/common_plat/validation/api/hash/hash.c
+++ b/test/common_plat/validation/api/hash/hash.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <odp_api.h>
 #include <odp_cunit_common.h>
 #include "hash.h"
diff --git a/test/common_plat/validation/api/hash/hash_main.c b/test/common_plat/validation/api/hash/hash_main.c
index f9818b7b..79cb1be0 100644
--- a/test/common_plat/validation/api/hash/hash_main.c
+++ b/test/common_plat/validation/api/hash/hash_main.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "hash.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/init/init.c b/test/common_plat/validation/api/init/init.c
index 61055fad..d024529f 100644
--- a/test/common_plat/validation/api/init/init.c
+++ b/test/common_plat/validation/api/init/init.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdarg.h>
 #include <stdlib.h>
 #include <odp_api.h>
diff --git a/test/common_plat/validation/api/init/init_main_abort.c b/test/common_plat/validation/api/init/init_main_abort.c
index 2e0faafb..8060b312 100644
--- a/test/common_plat/validation/api/init/init_main_abort.c
+++ b/test/common_plat/validation/api/init/init_main_abort.c
@@ -3,6 +3,10 @@
  *
  * SPDX-License-Identifier:     BSD-3-Clause
  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "init.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/init/init_main_log.c b/test/common_plat/validation/api/init/init_main_log.c
index 41dd00d7..44cef543 100644
--- a/test/common_plat/validation/api/init/init_main_log.c
+++ b/test/common_plat/validation/api/init/init_main_log.c
@@ -3,6 +3,10 @@
  *
  * SPDX-License-Identifier:     BSD-3-Clause
  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "init.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/init/init_main_ok.c b/test/common_plat/validation/api/init/init_main_ok.c
index 6053ec18..a45c4ba8 100644
--- a/test/common_plat/validation/api/init/init_main_ok.c
+++ b/test/common_plat/validation/api/init/init_main_ok.c
@@ -3,6 +3,10 @@
  *
  * SPDX-License-Identifier:     BSD-3-Clause
  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include "init.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/lock/lock.c b/test/common_plat/validation/api/lock/lock.c
index f8a1d8c0..c7579ec9 100644
--- a/test/common_plat/validation/api/lock/lock.c
+++ b/test/common_plat/validation/api/lock/lock.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:	 BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <malloc.h>
 #include <odp_api.h>
 #include <CUnit/Basic.h>
diff --git a/test/common_plat/validation/api/lock/lock_main.c b/test/common_plat/validation/api/lock/lock_main.c
index 5a30f02b..85e18e17 100644
--- a/test/common_plat/validation/api/lock/lock_main.c
+++ b/test/common_plat/validation/api/lock/lock_main.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "lock.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/packet/packet.c b/test/common_plat/validation/api/packet/packet.c
index 284aaeb5..384cfc74 100644
--- a/test/common_plat/validation/api/packet/packet.c
+++ b/test/common_plat/validation/api/packet/packet.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 
 #include <odp_api.h>
diff --git a/test/common_plat/validation/api/packet/packet_main.c b/test/common_plat/validation/api/packet/packet_main.c
index 511bb104..ce4a8d79 100644
--- a/test/common_plat/validation/api/packet/packet_main.c
+++ b/test/common_plat/validation/api/packet/packet_main.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "packet.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/pktio/parser.c b/test/common_plat/validation/api/pktio/parser.c
index ad7101d0..661871f0 100644
--- a/test/common_plat/validation/api/pktio/parser.c
+++ b/test/common_plat/validation/api/pktio/parser.c
@@ -3,6 +3,10 @@
  *
  * SPDX-License-Identifier:     BSD-3-Clause
  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <odp_api.h>
 #include <odp_cunit_common.h>
 
diff --git a/test/common_plat/validation/api/pktio/pktio.c b/test/common_plat/validation/api/pktio/pktio.c
index c476a712..ce59d38c 100644
--- a/test/common_plat/validation/api/pktio/pktio.c
+++ b/test/common_plat/validation/api/pktio/pktio.c
@@ -3,6 +3,10 @@
  *
  * SPDX-License-Identifier:     BSD-3-Clause
  */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 #include <odp_api.h>
 #include <odp_cunit_common.h>
 
diff --git a/test/common_plat/validation/api/pktio/pktio_main.c b/test/common_plat/validation/api/pktio/pktio_main.c
index 2928e1b8..94ae0c08 100644
--- a/test/common_plat/validation/api/pktio/pktio_main.c
+++ b/test/common_plat/validation/api/pktio/pktio_main.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "pktio.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/pool/pool.c b/test/common_plat/validation/api/pool/pool.c
index 8687941f..eaca9637 100644
--- a/test/common_plat/validation/api/pool/pool.c
+++ b/test/common_plat/validation/api/pool/pool.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <odp_api.h>
 #include "odp_cunit_common.h"
 #include "pool.h"
diff --git a/test/common_plat/validation/api/pool/pool_main.c b/test/common_plat/validation/api/pool/pool_main.c
index bf06585b..19eab971 100644
--- a/test/common_plat/validation/api/pool/pool_main.c
+++ b/test/common_plat/validation/api/pool/pool_main.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "pool.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/queue/queue.c b/test/common_plat/validation/api/queue/queue.c
index f08d811f..80d02760 100644
--- a/test/common_plat/validation/api/queue/queue.c
+++ b/test/common_plat/validation/api/queue/queue.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <odp_api.h>
 #include <odp_cunit_common.h>
 #include "queue.h"
diff --git a/test/common_plat/validation/api/queue/queue_main.c b/test/common_plat/validation/api/queue/queue_main.c
index b461b860..b06cfc43 100644
--- a/test/common_plat/validation/api/queue/queue_main.c
+++ b/test/common_plat/validation/api/queue/queue_main.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "queue.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/random/random.c b/test/common_plat/validation/api/random/random.c
index a0e2ef72..17c07520 100644
--- a/test/common_plat/validation/api/random/random.c
+++ b/test/common_plat/validation/api/random/random.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <odp_api.h>
 #include <odp_cunit_common.h>
 #include "random.h"
diff --git a/test/common_plat/validation/api/random/random_main.c b/test/common_plat/validation/api/random/random_main.c
index 8f38a84c..2fb80991 100644
--- a/test/common_plat/validation/api/random/random_main.c
+++ b/test/common_plat/validation/api/random/random_main.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "random.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/scheduler/scheduler.c b/test/common_plat/validation/api/scheduler/scheduler.c
index 4f99435c..87cb6918 100644
--- a/test/common_plat/validation/api/scheduler/scheduler.c
+++ b/test/common_plat/validation/api/scheduler/scheduler.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <odp_api.h>
 #include "odp_cunit_common.h"
 #include "scheduler.h"
diff --git a/test/common_plat/validation/api/scheduler/scheduler_main.c b/test/common_plat/validation/api/scheduler/scheduler_main.c
index 57cfa5fc..6a56ddec 100644
--- a/test/common_plat/validation/api/scheduler/scheduler_main.c
+++ b/test/common_plat/validation/api/scheduler/scheduler_main.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "scheduler.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/shmem/shmem.c b/test/common_plat/validation/api/shmem/shmem.c
index 0e757a70..ce180077 100644
--- a/test/common_plat/validation/api/shmem/shmem.c
+++ b/test/common_plat/validation/api/shmem/shmem.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <odp_api.h>
 #include <odp_cunit_common.h>
 #include "shmem.h"
diff --git a/test/common_plat/validation/api/shmem/shmem_main.c b/test/common_plat/validation/api/shmem/shmem_main.c
index 4c691305..b58dfdb5 100644
--- a/test/common_plat/validation/api/shmem/shmem_main.c
+++ b/test/common_plat/validation/api/shmem/shmem_main.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "shmem.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/std_clib/std_clib.c b/test/common_plat/validation/api/std_clib/std_clib.c
index 7f089eab..ffc957cf 100644
--- a/test/common_plat/validation/api/std_clib/std_clib.c
+++ b/test/common_plat/validation/api/std_clib/std_clib.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <odp_api.h>
 #include <odp_cunit_common.h>
 #include "std_clib.h"
diff --git a/test/common_plat/validation/api/std_clib/std_clib_main.c b/test/common_plat/validation/api/std_clib/std_clib_main.c
index ef6f2736..45080e83 100644
--- a/test/common_plat/validation/api/std_clib/std_clib_main.c
+++ b/test/common_plat/validation/api/std_clib/std_clib_main.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "std_clib.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/system/system.c b/test/common_plat/validation/api/system/system.c
index 5b7ca01a..d00c9c20 100644
--- a/test/common_plat/validation/api/system/system.c
+++ b/test/common_plat/validation/api/system/system.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <ctype.h>
 #include <odp_api.h>
 #include <odp/api/cpumask.h>
diff --git a/test/common_plat/validation/api/system/system_main.c b/test/common_plat/validation/api/system/system_main.c
index 50d202a8..d4baf8af 100644
--- a/test/common_plat/validation/api/system/system_main.c
+++ b/test/common_plat/validation/api/system/system_main.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "system.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/thread/thread.c b/test/common_plat/validation/api/thread/thread.c
index 24f1c458..1f7ca84c 100644
--- a/test/common_plat/validation/api/thread/thread.c
+++ b/test/common_plat/validation/api/thread/thread.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <odp_api.h>
 #include <odp_cunit_common.h>
 #include <mask_common.h>
diff --git a/test/common_plat/validation/api/thread/thread_main.c b/test/common_plat/validation/api/thread/thread_main.c
index 53c75655..9badc312 100644
--- a/test/common_plat/validation/api/thread/thread_main.c
+++ b/test/common_plat/validation/api/thread/thread_main.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "thread.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/time/time.c b/test/common_plat/validation/api/time/time.c
index e2ca2e17..2473b19c 100644
--- a/test/common_plat/validation/api/time/time.c
+++ b/test/common_plat/validation/api/time/time.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <odp_api.h>
 #include "odp_cunit_common.h"
 #include "time_test.h"
diff --git a/test/common_plat/validation/api/time/time_main.c b/test/common_plat/validation/api/time/time_main.c
index bf1cfe7b..6ea94ddf 100644
--- a/test/common_plat/validation/api/time/time_main.c
+++ b/test/common_plat/validation/api/time/time_main.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "time_test.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/timer/timer.c b/test/common_plat/validation/api/timer/timer.c
index b7d84c64..5594e0ea 100644
--- a/test/common_plat/validation/api/timer/timer.c
+++ b/test/common_plat/validation/api/timer/timer.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /**
  * @file
  */
diff --git a/test/common_plat/validation/api/timer/timer_main.c b/test/common_plat/validation/api/timer/timer_main.c
index c318763f..db5268b6 100644
--- a/test/common_plat/validation/api/timer/timer_main.c
+++ b/test/common_plat/validation/api/timer/timer_main.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "timer.h"
 
 int main(int argc, char *argv[])
diff --git a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c
index 88a7d8c7..8ff86b37 100644
--- a/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c
+++ b/test/common_plat/validation/api/traffic_mngr/traffic_mngr.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #define _GNU_SOURCE
 
 #include <stdlib.h>
diff --git a/test/common_plat/validation/api/traffic_mngr/traffic_mngr_main.c b/test/common_plat/validation/api/traffic_mngr/traffic_mngr_main.c
index 1fc1f78d..7668b45e 100644
--- a/test/common_plat/validation/api/traffic_mngr/traffic_mngr_main.c
+++ b/test/common_plat/validation/api/traffic_mngr/traffic_mngr_main.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:	BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "traffic_mngr.h"
 
 int main(int argc, char *argv[])
diff --git a/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c b/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c
index e91a9d0d..6ed9fea3 100644
--- a/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c
+++ b/test/linux-generic/mmap_vlan_ins/mmap_vlan_ins.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <getopt.h>
diff --git a/test/linux-generic/pktio_ipc/ipc_common.c b/test/linux-generic/pktio_ipc/ipc_common.c
index 85cbc8b4..e77d6610 100644
--- a/test/linux-generic/pktio_ipc/ipc_common.c
+++ b/test/linux-generic/pktio_ipc/ipc_common.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ipc_common.h"
 
 /** Run time in seconds */
diff --git a/test/linux-generic/pktio_ipc/pktio_ipc1.c b/test/linux-generic/pktio_ipc/pktio_ipc1.c
index 5d8434bf..65dc9c46 100644
--- a/test/linux-generic/pktio_ipc/pktio_ipc1.c
+++ b/test/linux-generic/pktio_ipc/pktio_ipc1.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ipc_common.h"
 
 /**
diff --git a/test/linux-generic/pktio_ipc/pktio_ipc2.c b/test/linux-generic/pktio_ipc/pktio_ipc2.c
index 95d69e80..4c8bf63e 100644
--- a/test/linux-generic/pktio_ipc/pktio_ipc2.c
+++ b/test/linux-generic/pktio_ipc/pktio_ipc2.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /**
  * @file
  *
diff --git a/test/linux-generic/ring/ring_basic.c b/test/linux-generic/ring/ring_basic.c
index 926dc465..a5b78f92 100644
--- a/test/linux-generic/ring/ring_basic.c
+++ b/test/linux-generic/ring/ring_basic.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /**
  * @file
  *
diff --git a/test/linux-generic/ring/ring_main.c b/test/linux-generic/ring/ring_main.c
index 71526884..442b4ced 100644
--- a/test/linux-generic/ring/ring_main.c
+++ b/test/linux-generic/ring/ring_main.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ring_suites.h"
 
 int main(int argc, char *argv[])
diff --git a/test/linux-generic/ring/ring_stress.c b/test/linux-generic/ring/ring_stress.c
index b6ddb34e..271d7a52 100644
--- a/test/linux-generic/ring/ring_stress.c
+++ b/test/linux-generic/ring/ring_stress.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /**
  * @file
  *
diff --git a/test/linux-generic/ring/ring_suites.c b/test/linux-generic/ring/ring_suites.c
index f321a762..0061d425 100644
--- a/test/linux-generic/ring/ring_suites.c
+++ b/test/linux-generic/ring/ring_suites.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/test/linux-generic/validation/api/shmem/shmem_linux.c b/test/linux-generic/validation/api/shmem/shmem_linux.c
index fe11a7db..de93b9a2 100644
--- a/test/linux-generic/validation/api/shmem/shmem_linux.c
+++ b/test/linux-generic/validation/api/shmem/shmem_linux.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /* 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/test/linux-generic/validation/api/shmem/shmem_odp1.c b/test/linux-generic/validation/api/shmem/shmem_odp1.c
index 0ced4554..7ba03d9e 100644
--- a/test/linux-generic/validation/api/shmem/shmem_odp1.c
+++ b/test/linux-generic/validation/api/shmem/shmem_odp1.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <odp.h>
 #include <linux/limits.h>
 #include <sys/types.h>
diff --git a/test/linux-generic/validation/api/shmem/shmem_odp2.c b/test/linux-generic/validation/api/shmem/shmem_odp2.c
index 0144407b..cf1cda6b 100644
--- a/test/linux-generic/validation/api/shmem/shmem_odp2.c
+++ b/test/linux-generic/validation/api/shmem/shmem_odp2.c
@@ -4,6 +4,10 @@
  * SPDX-License-Identifier:     BSD-3-Clause
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <odp.h>
 #include <linux/limits.h>
 #include <sys/types.h>
