[rtems commit] testsuites/ada: Introduce init.c files

Wed Nov 27 11:03:42 UTC 2019

Module:    rtems
Branch:    master
Commit:    1fca16659754d1e7c0ac12a81bd24003dbc80c56
Changeset: http://git.rtems.org/rtems/commit/?id=1fca16659754d1e7c0ac12a81bd24003dbc80c56

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Wed Nov 27 11:41:06 2019 +0100

testsuites/ada: Introduce init.c files

Provide an init.c for each Ada test instead of the #include <config.h>
magic which works only due to hand crafted include paths.

Update #3818.

---

 testsuites/ada/mptests/mp01/config_base.h                         | 2 +-
 testsuites/ada/mptests/mp01/node1/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp14/node1/config.h => mp01/node1/init.c} | 0
 testsuites/ada/mptests/mp01/node2/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp14/node2/config.h => mp01/node2/init.c} | 0
 testsuites/ada/mptests/mp03/config_base.h                         | 2 +-
 testsuites/ada/mptests/mp03/node1/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp13/node1/config.h => mp03/node1/init.c} | 0
 testsuites/ada/mptests/mp03/node2/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp13/node2/config.h => mp03/node2/init.c} | 0
 testsuites/ada/mptests/mp04/config_base.h                         | 2 +-
 testsuites/ada/mptests/mp04/node1/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp12/node1/config.h => mp04/node1/init.c} | 0
 testsuites/ada/mptests/mp04/node2/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp12/node2/config.h => mp04/node2/init.c} | 0
 testsuites/ada/mptests/mp05/config_base.h                         | 2 +-
 testsuites/ada/mptests/mp05/node1/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp11/node1/config.h => mp05/node1/init.c} | 0
 testsuites/ada/mptests/mp05/node2/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp11/node2/config.h => mp05/node2/init.c} | 0
 testsuites/ada/mptests/mp06/config_base.h                         | 2 +-
 testsuites/ada/mptests/mp06/node1/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp10/node1/config.h => mp06/node1/init.c} | 0
 testsuites/ada/mptests/mp06/node2/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp10/node2/config.h => mp06/node2/init.c} | 0
 testsuites/ada/mptests/mp07/config_base.h                         | 2 +-
 testsuites/ada/mptests/mp07/node1/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp09/node1/config.h => mp07/node1/init.c} | 0
 testsuites/ada/mptests/mp07/node2/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp09/node2/config.h => mp07/node2/init.c} | 0
 testsuites/ada/mptests/mp08/config_base.h                         | 2 +-
 testsuites/ada/mptests/mp08/node1/Makefile.am                     | 2 +-
 testsuites/ada/mptests/mp08/node1/{config.h => init.c}            | 0
 testsuites/ada/mptests/mp08/node2/Makefile.am                     | 2 +-
 testsuites/ada/mptests/mp08/node2/{config.h => init.c}            | 0
 testsuites/ada/mptests/mp09/config_base.h                         | 2 +-
 testsuites/ada/mptests/mp09/node1/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp07/node1/config.h => mp09/node1/init.c} | 0
 testsuites/ada/mptests/mp09/node2/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp07/node2/config.h => mp09/node2/init.c} | 0
 testsuites/ada/mptests/mp10/config_base.h                         | 2 +-
 testsuites/ada/mptests/mp10/node1/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp06/node1/config.h => mp10/node1/init.c} | 0
 testsuites/ada/mptests/mp10/node2/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp06/node2/config.h => mp10/node2/init.c} | 0
 testsuites/ada/mptests/mp11/config_base.h                         | 2 +-
 testsuites/ada/mptests/mp11/node1/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp05/node1/config.h => mp11/node1/init.c} | 0
 testsuites/ada/mptests/mp11/node2/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp05/node2/config.h => mp11/node2/init.c} | 0
 testsuites/ada/mptests/mp12/config_base.h                         | 2 +-
 testsuites/ada/mptests/mp12/node1/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp04/node1/config.h => mp12/node1/init.c} | 0
 testsuites/ada/mptests/mp12/node2/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp04/node2/config.h => mp12/node2/init.c} | 0
 testsuites/ada/mptests/mp13/config_base.h                         | 2 +-
 testsuites/ada/mptests/mp13/node1/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp03/node1/config.h => mp13/node1/init.c} | 0
 testsuites/ada/mptests/mp13/node2/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp03/node2/config.h => mp13/node2/init.c} | 0
 testsuites/ada/mptests/mp14/config_base.h                         | 2 +-
 testsuites/ada/mptests/mp14/node1/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp01/node1/config.h => mp14/node1/init.c} | 0
 testsuites/ada/mptests/mp14/node2/Makefile.am                     | 2 +-
 testsuites/ada/mptests/{mp01/node2/config.h => mp14/node2/init.c} | 0
 testsuites/ada/samples/base_mp/{config.h => init.c}               | 2 +-
 testsuites/ada/samples/base_sp/Makefile.am                        | 2 +-
 testsuites/ada/samples/base_sp/{config.h => init.c}               | 2 +-
 testsuites/ada/samples/hello/Makefile.am                          | 2 +-
 testsuites/ada/samples/hello/{config.h => init.c}                 | 2 +-
 testsuites/ada/samples/nsecs/Makefile.am                          | 2 +-
 testsuites/ada/samples/nsecs/{config.h => init.c}                 | 2 +-
 testsuites/ada/samples/ticker/Makefile.am                         | 2 +-
 testsuites/ada/samples/ticker/{config.h => init.c}                | 2 +-
 testsuites/ada/sptests/sp01/Makefile.am                           | 2 +-
 testsuites/ada/sptests/sp01/{config.h => init.c}                  | 2 +-
 testsuites/ada/sptests/sp02/Makefile.am                           | 2 +-
 testsuites/ada/sptests/sp02/{config.h => init.c}                  | 2 +-
 testsuites/ada/sptests/sp03/Makefile.am                           | 2 +-
 testsuites/ada/sptests/sp03/{config.h => init.c}                  | 2 +-
 testsuites/ada/sptests/sp04/Makefile.am                           | 2 +-
 testsuites/ada/sptests/sp04/{config.h => init.c}                  | 2 +-
 testsuites/ada/sptests/sp05/Makefile.am                           | 2 +-
 testsuites/ada/sptests/sp05/{config.h => init.c}                  | 2 +-
 testsuites/ada/sptests/sp06/Makefile.am                           | 2 +-
 testsuites/ada/sptests/sp06/{config.h => init.c}                  | 2 +-
 testsuites/ada/sptests/sp07/Makefile.am                           | 2 +-
 testsuites/ada/sptests/sp07/{config.h => init.c}                  | 2 +-
 testsuites/ada/sptests/sp08/Makefile.am                           | 2 +-
 testsuites/ada/sptests/sp08/{config.h => init.c}                  | 2 +-
 testsuites/ada/sptests/sp09/Makefile.am                           | 2 +-
 testsuites/ada/sptests/sp09/{config.h => init.c}                  | 2 +-
 testsuites/ada/sptests/sp11/Makefile.am                           | 2 +-
 testsuites/ada/sptests/sp11/{config.h => init.c}                  | 2 +-
 testsuites/ada/sptests/sp12/Makefile.am                           | 2 +-
 testsuites/ada/sptests/sp12/{config.h => init.c}                  | 2 +-
 testsuites/ada/sptests/sp13/Makefile.am                           | 2 +-
 testsuites/ada/sptests/sp13/{config.h => init.c}                  | 2 +-
 testsuites/ada/sptests/sp14/Makefile.am                           | 2 +-
 testsuites/ada/sptests/sp14/{config.h => init.c}                  | 2 +-
 testsuites/ada/sptests/sp15/Makefile.am                           | 2 +-
 testsuites/ada/sptests/sp15/{config.h => init.c}                  | 2 +-
 testsuites/ada/sptests/sp16/Makefile.am                           | 2 +-
 testsuites/ada/sptests/sp16/{config.h => init.c}                  | 2 +-
 testsuites/ada/sptests/sp17/Makefile.am                           | 2 +-
 testsuites/ada/sptests/sp17/{config.h => init.c}                  | 2 +-
 testsuites/ada/sptests/sp19/Makefile.am                           | 2 +-
 testsuites/ada/sptests/sp19/{config.h => init.c}                  | 2 +-
 testsuites/ada/sptests/sp20/Makefile.am                           | 2 +-
 testsuites/ada/sptests/sp20/{config.h => init.c}                  | 2 +-
 testsuites/ada/sptests/sp22/Makefile.am                           | 2 +-
 testsuites/ada/sptests/sp22/{config.h => init.c}                  | 2 +-
 testsuites/ada/sptests/sp23/Makefile.am                           | 2 +-
 testsuites/ada/sptests/sp23/{config.h => init.c}                  | 2 +-
 testsuites/ada/sptests/sp24/Makefile.am                           | 2 +-
 testsuites/ada/sptests/sp24/{config.h => init.c}                  | 2 +-
 testsuites/ada/sptests/sp25/Makefile.am                           | 2 +-
 testsuites/ada/sptests/sp25/{config.h => init.c}                  | 2 +-
 testsuites/ada/sptests/spatcb01/Makefile.am                       | 2 +-
 testsuites/ada/sptests/spatcb01/{config.h => init.c}              | 2 +-
 testsuites/ada/sptests/spname01/Makefile.am                       | 2 +-
 testsuites/ada/sptests/spname01/{config.h => init.c}              | 2 +-
 testsuites/ada/support/{init.c => initimpl.h}                     | 2 +-
 testsuites/ada/tmtests/tm01/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm01/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm02/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm02/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm03/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm03/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm04/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm04/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm05/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm05/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm06/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm06/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm07/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm07/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm08/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm08/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm09/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm09/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm10/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm10/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm11/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm11/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm12/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm12/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm13/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm13/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm14/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm14/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm15/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm15/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm16/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm16/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm17/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm17/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm18/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm18/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm19/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm19/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm20/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm20/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm21/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm21/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm22/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm22/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm23/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm23/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm24/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm24/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm25/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm25/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm28/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm28/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tm29/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tm29/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tmck/Makefile.am                           | 2 +-
 testsuites/ada/tmtests/tmck/{config.h => init.c}                  | 2 +-
 testsuites/ada/tmtests/tmoverhd/Makefile.am                       | 2 +-
 testsuites/ada/tmtests/tmoverhd/{config.h => init.c}              | 2 +-
 181 files changed, 155 insertions(+), 155 deletions(-)

diff --git a/testsuites/ada/mptests/mp01/config_base.h b/testsuites/ada/mptests/mp01/config_base.h
index fca97d6..8f4dda9 100644
--- a/testsuites/ada/mptests/mp01/config_base.h
+++ b/testsuites/ada/mptests/mp01/config_base.h
@@ -25,6 +25,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/mptests/mp01/node1/Makefile.am b/testsuites/ada/mptests/mp01/node1/Makefile.am
index 7d78a6f..45b7f4b 100644
--- a/testsuites/ada/mptests/mp01/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp01/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp01_ada_mp01_node1
 mp01_ada_mp01_node1_SOURCES = mp01_node1.adb ../mptest.adb config.h
 mp01_ada_mp01_node1_SOURCES += ../mptest.ads
-mp01_ada_mp01_node1_SOURCES += ../../../support/init.c
+mp01_ada_mp01_node1_SOURCES += init.c
 
 mp01_ada_mp01_node1$(EXEEXT): mp01_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp14/node1/config.h b/testsuites/ada/mptests/mp01/node1/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp14/node1/config.h
rename to testsuites/ada/mptests/mp01/node1/init.c
diff --git a/testsuites/ada/mptests/mp01/node2/Makefile.am b/testsuites/ada/mptests/mp01/node2/Makefile.am
index 907766e..ee65441 100644
--- a/testsuites/ada/mptests/mp01/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp01/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp01_ada_mp01_node2
 mp01_ada_mp01_node2_SOURCES = mp01_node2.adb ../mptest.adb config.h
 mp01_ada_mp01_node2_SOURCES += ../mptest.ads
-mp01_ada_mp01_node2_SOURCES += ../../../support/init.c
+mp01_ada_mp01_node2_SOURCES += init.c
 
 mp01_ada_mp01_node2$(EXEEXT): mp01_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp14/node2/config.h b/testsuites/ada/mptests/mp01/node2/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp14/node2/config.h
rename to testsuites/ada/mptests/mp01/node2/init.c
diff --git a/testsuites/ada/mptests/mp03/config_base.h b/testsuites/ada/mptests/mp03/config_base.h
index 9a1c49e..ab111cb 100644
--- a/testsuites/ada/mptests/mp03/config_base.h
+++ b/testsuites/ada/mptests/mp03/config_base.h
@@ -25,6 +25,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/mptests/mp03/node1/Makefile.am b/testsuites/ada/mptests/mp03/node1/Makefile.am
index 679d7a9..4a59642 100644
--- a/testsuites/ada/mptests/mp03/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp03/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp03_ada_mp03_node1
 mp03_ada_mp03_node1_SOURCES = mp03_node1.adb ../mptest.adb config.h
 mp03_ada_mp03_node1_SOURCES += ../mptest.ads
-mp03_ada_mp03_node1_SOURCES += ../../../support/init.c
+mp03_ada_mp03_node1_SOURCES += init.c
 
 mp03_ada_mp03_node1$(EXEEXT): mp03_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp13/node1/config.h b/testsuites/ada/mptests/mp03/node1/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp13/node1/config.h
rename to testsuites/ada/mptests/mp03/node1/init.c
diff --git a/testsuites/ada/mptests/mp03/node2/Makefile.am b/testsuites/ada/mptests/mp03/node2/Makefile.am
index 80db1c1..7ed6700 100644
--- a/testsuites/ada/mptests/mp03/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp03/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp03_ada_mp03_node2
 mp03_ada_mp03_node2_SOURCES = mp03_node2.adb ../mptest.adb config.h
 mp03_ada_mp03_node2_SOURCES += ../mptest.ads
-mp03_ada_mp03_node2_SOURCES += ../../../support/init.c
+mp03_ada_mp03_node2_SOURCES += init.c
 
 mp03_ada_mp03_node2$(EXEEXT): mp03_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp13/node2/config.h b/testsuites/ada/mptests/mp03/node2/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp13/node2/config.h
rename to testsuites/ada/mptests/mp03/node2/init.c
diff --git a/testsuites/ada/mptests/mp04/config_base.h b/testsuites/ada/mptests/mp04/config_base.h
index 71aca53..ab27074 100644
--- a/testsuites/ada/mptests/mp04/config_base.h
+++ b/testsuites/ada/mptests/mp04/config_base.h
@@ -25,6 +25,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/mptests/mp04/node1/Makefile.am b/testsuites/ada/mptests/mp04/node1/Makefile.am
index 496ff62..98c7e19 100644
--- a/testsuites/ada/mptests/mp04/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp04/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp04_ada_mp04_node1
 mp04_ada_mp04_node1_SOURCES = mp04_node1.adb ../mptest.adb config.h
 mp04_ada_mp04_node1_SOURCES += ../mptest.ads
-mp04_ada_mp04_node1_SOURCES += ../../../support/init.c
+mp04_ada_mp04_node1_SOURCES += init.c
 
 mp04_ada_mp04_node1$(EXEEXT): mp04_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp12/node1/config.h b/testsuites/ada/mptests/mp04/node1/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp12/node1/config.h
rename to testsuites/ada/mptests/mp04/node1/init.c
diff --git a/testsuites/ada/mptests/mp04/node2/Makefile.am b/testsuites/ada/mptests/mp04/node2/Makefile.am
index a2192b1..e8cdb3e 100644
--- a/testsuites/ada/mptests/mp04/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp04/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp04_ada_mp04_node2
 mp04_ada_mp04_node2_SOURCES = mp04_node2.adb ../mptest.adb config.h
 mp04_ada_mp04_node2_SOURCES += ../mptest.ads
-mp04_ada_mp04_node2_SOURCES += ../../../support/init.c
+mp04_ada_mp04_node2_SOURCES += init.c
 
 mp04_ada_mp04_node2$(EXEEXT): mp04_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp12/node2/config.h b/testsuites/ada/mptests/mp04/node2/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp12/node2/config.h
rename to testsuites/ada/mptests/mp04/node2/init.c
diff --git a/testsuites/ada/mptests/mp05/config_base.h b/testsuites/ada/mptests/mp05/config_base.h
index 2728ab2..1123c5c 100644
--- a/testsuites/ada/mptests/mp05/config_base.h
+++ b/testsuites/ada/mptests/mp05/config_base.h
@@ -25,6 +25,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/mptests/mp05/node1/Makefile.am b/testsuites/ada/mptests/mp05/node1/Makefile.am
index edae16e..351bad9 100644
--- a/testsuites/ada/mptests/mp05/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp05/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp05_ada_mp05_node1
 mp05_ada_mp05_node1_SOURCES = mp05_node1.adb ../mptest.adb config.h
 mp05_ada_mp05_node1_SOURCES += ../mptest.ads
-mp05_ada_mp05_node1_SOURCES += ../../../support/init.c
+mp05_ada_mp05_node1_SOURCES += init.c
 
 mp05_ada_mp05_node1$(EXEEXT): mp05_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp11/node1/config.h b/testsuites/ada/mptests/mp05/node1/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp11/node1/config.h
rename to testsuites/ada/mptests/mp05/node1/init.c
diff --git a/testsuites/ada/mptests/mp05/node2/Makefile.am b/testsuites/ada/mptests/mp05/node2/Makefile.am
index 06aa7e9..ca62388 100644
--- a/testsuites/ada/mptests/mp05/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp05/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp05_ada_mp05_node2
 mp05_ada_mp05_node2_SOURCES = mp05_node2.adb ../mptest.adb config.h
 mp05_ada_mp05_node2_SOURCES += ../mptest.ads
-mp05_ada_mp05_node2_SOURCES += ../../../support/init.c
+mp05_ada_mp05_node2_SOURCES += init.c
 
 mp05_ada_mp05_node2$(EXEEXT): mp05_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp11/node2/config.h b/testsuites/ada/mptests/mp05/node2/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp11/node2/config.h
rename to testsuites/ada/mptests/mp05/node2/init.c
diff --git a/testsuites/ada/mptests/mp06/config_base.h b/testsuites/ada/mptests/mp06/config_base.h
index f3e3972..a0259d0 100644
--- a/testsuites/ada/mptests/mp06/config_base.h
+++ b/testsuites/ada/mptests/mp06/config_base.h
@@ -25,6 +25,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/mptests/mp06/node1/Makefile.am b/testsuites/ada/mptests/mp06/node1/Makefile.am
index 201d17c..68771e1 100644
--- a/testsuites/ada/mptests/mp06/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp06/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp06_ada_mp06_node1
 mp06_ada_mp06_node1_SOURCES = mp06_node1.adb ../mptest.adb config.h
 mp06_ada_mp06_node1_SOURCES += ../mptest.ads
-mp06_ada_mp06_node1_SOURCES += ../../../support/init.c
+mp06_ada_mp06_node1_SOURCES += init.c
 
 mp06_ada_mp06_node1$(EXEEXT): mp06_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp10/node1/config.h b/testsuites/ada/mptests/mp06/node1/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp10/node1/config.h
rename to testsuites/ada/mptests/mp06/node1/init.c
diff --git a/testsuites/ada/mptests/mp06/node2/Makefile.am b/testsuites/ada/mptests/mp06/node2/Makefile.am
index 3df636d..8e5d4bd 100644
--- a/testsuites/ada/mptests/mp06/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp06/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp06_ada_mp06_node2
 mp06_ada_mp06_node2_SOURCES = mp06_node2.adb ../mptest.adb config.h
 mp06_ada_mp06_node2_SOURCES += ../mptest.ads
-mp06_ada_mp06_node2_SOURCES += ../../../support/init.c
+mp06_ada_mp06_node2_SOURCES += init.c
 
 mp06_ada_mp06_node2$(EXEEXT): mp06_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp10/node2/config.h b/testsuites/ada/mptests/mp06/node2/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp10/node2/config.h
rename to testsuites/ada/mptests/mp06/node2/init.c
diff --git a/testsuites/ada/mptests/mp07/config_base.h b/testsuites/ada/mptests/mp07/config_base.h
index 7df48cd..51fd613 100644
--- a/testsuites/ada/mptests/mp07/config_base.h
+++ b/testsuites/ada/mptests/mp07/config_base.h
@@ -25,6 +25,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/mptests/mp07/node1/Makefile.am b/testsuites/ada/mptests/mp07/node1/Makefile.am
index d39a38d..81bdb18 100644
--- a/testsuites/ada/mptests/mp07/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp07/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp07_ada_mp07_node1
 mp07_ada_mp07_node1_SOURCES = mp07_node1.adb ../mptest.adb config.h
 mp07_ada_mp07_node1_SOURCES += ../mptest.ads
-mp07_ada_mp07_node1_SOURCES += ../../../support/init.c
+mp07_ada_mp07_node1_SOURCES += init.c
 
 mp07_ada_mp07_node1$(EXEEXT): mp07_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp09/node1/config.h b/testsuites/ada/mptests/mp07/node1/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp09/node1/config.h
rename to testsuites/ada/mptests/mp07/node1/init.c
diff --git a/testsuites/ada/mptests/mp07/node2/Makefile.am b/testsuites/ada/mptests/mp07/node2/Makefile.am
index acf5e4a..4ec3988 100644
--- a/testsuites/ada/mptests/mp07/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp07/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp07_ada_mp07_node2
 mp07_ada_mp07_node2_SOURCES = mp07_node2.adb ../mptest.adb config.h
 mp07_ada_mp07_node2_SOURCES += ../mptest.ads
-mp07_ada_mp07_node2_SOURCES += ../../../support/init.c
+mp07_ada_mp07_node2_SOURCES += init.c
 
 mp07_ada_mp07_node2$(EXEEXT): mp07_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp09/node2/config.h b/testsuites/ada/mptests/mp07/node2/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp09/node2/config.h
rename to testsuites/ada/mptests/mp07/node2/init.c
diff --git a/testsuites/ada/mptests/mp08/config_base.h b/testsuites/ada/mptests/mp08/config_base.h
index 74367e7..f524a4c 100644
--- a/testsuites/ada/mptests/mp08/config_base.h
+++ b/testsuites/ada/mptests/mp08/config_base.h
@@ -25,6 +25,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/mptests/mp08/node1/Makefile.am b/testsuites/ada/mptests/mp08/node1/Makefile.am
index 2885adb..7ac4d2f 100644
--- a/testsuites/ada/mptests/mp08/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp08/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp08_ada_mp08_node1
 mp08_ada_mp08_node1_SOURCES = mp08_node1.adb ../mptest.adb config.h
 mp08_ada_mp08_node1_SOURCES += ../mptest.ads
-mp08_ada_mp08_node1_SOURCES += ../../../support/init.c
+mp08_ada_mp08_node1_SOURCES += init.c
 
 mp08_ada_mp08_node1$(EXEEXT): mp08_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp08/node1/config.h b/testsuites/ada/mptests/mp08/node1/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp08/node1/config.h
rename to testsuites/ada/mptests/mp08/node1/init.c
diff --git a/testsuites/ada/mptests/mp08/node2/Makefile.am b/testsuites/ada/mptests/mp08/node2/Makefile.am
index 4f174ac..6f808f1 100644
--- a/testsuites/ada/mptests/mp08/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp08/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp08_ada_mp08_node2
 mp08_ada_mp08_node2_SOURCES = mp08_node2.adb ../mptest.adb config.h
 mp08_ada_mp08_node2_SOURCES += ../mptest.ads
-mp08_ada_mp08_node2_SOURCES += ../../../support/init.c
+mp08_ada_mp08_node2_SOURCES += init.c
 
 mp08_ada_mp08_node2$(EXEEXT): mp08_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp08/node2/config.h b/testsuites/ada/mptests/mp08/node2/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp08/node2/config.h
rename to testsuites/ada/mptests/mp08/node2/init.c
diff --git a/testsuites/ada/mptests/mp09/config_base.h b/testsuites/ada/mptests/mp09/config_base.h
index 8145297..f84b739 100644
--- a/testsuites/ada/mptests/mp09/config_base.h
+++ b/testsuites/ada/mptests/mp09/config_base.h
@@ -25,6 +25,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/mptests/mp09/node1/Makefile.am b/testsuites/ada/mptests/mp09/node1/Makefile.am
index 6847835..6e41e40 100644
--- a/testsuites/ada/mptests/mp09/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp09/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp09_ada_mp09_node1
 mp09_ada_mp09_node1_SOURCES = mp09_node1.adb ../mptest.adb config.h
 mp09_ada_mp09_node1_SOURCES += ../mptest.ads
-mp09_ada_mp09_node1_SOURCES += ../../../support/init.c
+mp09_ada_mp09_node1_SOURCES += init.c
 
 mp09_ada_mp09_node1$(EXEEXT): mp09_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp07/node1/config.h b/testsuites/ada/mptests/mp09/node1/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp07/node1/config.h
rename to testsuites/ada/mptests/mp09/node1/init.c
diff --git a/testsuites/ada/mptests/mp09/node2/Makefile.am b/testsuites/ada/mptests/mp09/node2/Makefile.am
index 61fd3f3..d8e748d 100644
--- a/testsuites/ada/mptests/mp09/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp09/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp09_ada_mp09_node2
 mp09_ada_mp09_node2_SOURCES = mp09_node2.adb ../mptest.adb config.h
 mp09_ada_mp09_node2_SOURCES += ../mptest.ads
-mp09_ada_mp09_node2_SOURCES += ../../../support/init.c
+mp09_ada_mp09_node2_SOURCES += init.c
 
 mp09_ada_mp09_node2$(EXEEXT): mp09_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp07/node2/config.h b/testsuites/ada/mptests/mp09/node2/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp07/node2/config.h
rename to testsuites/ada/mptests/mp09/node2/init.c
diff --git a/testsuites/ada/mptests/mp10/config_base.h b/testsuites/ada/mptests/mp10/config_base.h
index 72f5c75..6bf24a6 100644
--- a/testsuites/ada/mptests/mp10/config_base.h
+++ b/testsuites/ada/mptests/mp10/config_base.h
@@ -25,6 +25,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/mptests/mp10/node1/Makefile.am b/testsuites/ada/mptests/mp10/node1/Makefile.am
index 029c77e..93cba93 100644
--- a/testsuites/ada/mptests/mp10/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp10/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp10_ada_mp10_node1
 mp10_ada_mp10_node1_SOURCES = mp10_node1.adb ../mptest.adb config.h 
 mp10_ada_mp10_node1_SOURCES += ../mptest.ads
-mp10_ada_mp10_node1_SOURCES += ../../../support/init.c
+mp10_ada_mp10_node1_SOURCES += init.c
 
 mp10_ada_mp10_node1$(EXEEXT): mp10_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp06/node1/config.h b/testsuites/ada/mptests/mp10/node1/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp06/node1/config.h
rename to testsuites/ada/mptests/mp10/node1/init.c
diff --git a/testsuites/ada/mptests/mp10/node2/Makefile.am b/testsuites/ada/mptests/mp10/node2/Makefile.am
index 70d1740..98907fa 100644
--- a/testsuites/ada/mptests/mp10/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp10/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp10_ada_mp10_node2
 mp10_ada_mp10_node2_SOURCES = mp10_node2.adb ../mptest.adb config.h
 mp10_ada_mp10_node2_SOURCES += ../mptest.ads
-mp10_ada_mp10_node2_SOURCES += ../../../support/init.c
+mp10_ada_mp10_node2_SOURCES += init.c
 
 mp10_ada_mp10_node2$(EXEEXT): mp10_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp06/node2/config.h b/testsuites/ada/mptests/mp10/node2/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp06/node2/config.h
rename to testsuites/ada/mptests/mp10/node2/init.c
diff --git a/testsuites/ada/mptests/mp11/config_base.h b/testsuites/ada/mptests/mp11/config_base.h
index c36c1ba..d0dd406 100644
--- a/testsuites/ada/mptests/mp11/config_base.h
+++ b/testsuites/ada/mptests/mp11/config_base.h
@@ -25,6 +25,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/mptests/mp11/node1/Makefile.am b/testsuites/ada/mptests/mp11/node1/Makefile.am
index ae6570e..2bba219 100644
--- a/testsuites/ada/mptests/mp11/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp11/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp11_ada_mp11_node1
 mp11_ada_mp11_node1_SOURCES = mp11_node1.adb ../mptest.adb config.h
 mp11_ada_mp11_node1_SOURCES += ../mptest.ads
-mp11_ada_mp11_node1_SOURCES += ../../../support/init.c
+mp11_ada_mp11_node1_SOURCES += init.c
 
 mp11_ada_mp11_node1$(EXEEXT): mp11_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp05/node1/config.h b/testsuites/ada/mptests/mp11/node1/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp05/node1/config.h
rename to testsuites/ada/mptests/mp11/node1/init.c
diff --git a/testsuites/ada/mptests/mp11/node2/Makefile.am b/testsuites/ada/mptests/mp11/node2/Makefile.am
index ae4cc32..5c78df4 100644
--- a/testsuites/ada/mptests/mp11/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp11/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp11_ada_mp11_node2
 mp11_ada_mp11_node2_SOURCES = mp11_node2.adb ../mptest.adb config.h
 mp11_ada_mp11_node2_SOURCES += ../mptest.ads
-mp11_ada_mp11_node2_SOURCES += ../../../support/init.c
+mp11_ada_mp11_node2_SOURCES += init.c
 
 mp11_ada_mp11_node2$(EXEEXT): mp11_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp05/node2/config.h b/testsuites/ada/mptests/mp11/node2/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp05/node2/config.h
rename to testsuites/ada/mptests/mp11/node2/init.c
diff --git a/testsuites/ada/mptests/mp12/config_base.h b/testsuites/ada/mptests/mp12/config_base.h
index 2d7952f..7ace8ca 100644
--- a/testsuites/ada/mptests/mp12/config_base.h
+++ b/testsuites/ada/mptests/mp12/config_base.h
@@ -25,6 +25,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/mptests/mp12/node1/Makefile.am b/testsuites/ada/mptests/mp12/node1/Makefile.am
index a95c153..0717da9 100644
--- a/testsuites/ada/mptests/mp12/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp12/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp12_ada_mp12_node1
 mp12_ada_mp12_node1_SOURCES = mp12_node1.adb ../mptest.adb config.h
 mp12_ada_mp12_node1_SOURCES += ../mptest.ads
-mp12_ada_mp12_node1_SOURCES += ../../../support/init.c
+mp12_ada_mp12_node1_SOURCES += init.c
 
 mp12_ada_mp12_node1$(EXEEXT): mp12_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp04/node1/config.h b/testsuites/ada/mptests/mp12/node1/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp04/node1/config.h
rename to testsuites/ada/mptests/mp12/node1/init.c
diff --git a/testsuites/ada/mptests/mp12/node2/Makefile.am b/testsuites/ada/mptests/mp12/node2/Makefile.am
index eb35a18..ae5e71b 100644
--- a/testsuites/ada/mptests/mp12/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp12/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp12_ada_mp12_node2
 mp12_ada_mp12_node2_SOURCES = mp12_node2.adb ../mptest.adb config.h
 mp12_ada_mp12_node2_SOURCES += ../mptest.ads
-mp12_ada_mp12_node2_SOURCES += ../../../support/init.c
+mp12_ada_mp12_node2_SOURCES += init.c
 
 mp12_ada_mp12_node2$(EXEEXT): mp12_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp04/node2/config.h b/testsuites/ada/mptests/mp12/node2/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp04/node2/config.h
rename to testsuites/ada/mptests/mp12/node2/init.c
diff --git a/testsuites/ada/mptests/mp13/config_base.h b/testsuites/ada/mptests/mp13/config_base.h
index 8799c9a..52e2d78 100644
--- a/testsuites/ada/mptests/mp13/config_base.h
+++ b/testsuites/ada/mptests/mp13/config_base.h
@@ -25,6 +25,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/mptests/mp13/node1/Makefile.am b/testsuites/ada/mptests/mp13/node1/Makefile.am
index 4020129..ee1ec62 100644
--- a/testsuites/ada/mptests/mp13/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp13/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp13_ada_mp13_node1
 mp13_ada_mp13_node1_SOURCES = mp13_node1.adb ../mptest.adb config.h
 mp13_ada_mp13_node1_SOURCES += ../mptest.ads
-mp13_ada_mp13_node1_SOURCES += ../../../support/init.c
+mp13_ada_mp13_node1_SOURCES += init.c
 
 mp13_ada_mp13_node1$(EXEEXT): mp13_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp03/node1/config.h b/testsuites/ada/mptests/mp13/node1/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp03/node1/config.h
rename to testsuites/ada/mptests/mp13/node1/init.c
diff --git a/testsuites/ada/mptests/mp13/node2/Makefile.am b/testsuites/ada/mptests/mp13/node2/Makefile.am
index 89ebc23..7137c7f 100644
--- a/testsuites/ada/mptests/mp13/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp13/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp13_ada_mp13_node2
 mp13_ada_mp13_node2_SOURCES = mp13_node2.adb ../mptest.adb config.h
 mp13_ada_mp13_node2_SOURCES += ../mptest.ads
-mp13_ada_mp13_node2_SOURCES += ../../../support/init.c
+mp13_ada_mp13_node2_SOURCES += init.c
 
 mp13_ada_mp13_node2$(EXEEXT): mp13_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp03/node2/config.h b/testsuites/ada/mptests/mp13/node2/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp03/node2/config.h
rename to testsuites/ada/mptests/mp13/node2/init.c
diff --git a/testsuites/ada/mptests/mp14/config_base.h b/testsuites/ada/mptests/mp14/config_base.h
index 6d2b79d..c8369dc 100644
--- a/testsuites/ada/mptests/mp14/config_base.h
+++ b/testsuites/ada/mptests/mp14/config_base.h
@@ -25,6 +25,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/mptests/mp14/node1/Makefile.am b/testsuites/ada/mptests/mp14/node1/Makefile.am
index 373b8b2..e9e76b4 100644
--- a/testsuites/ada/mptests/mp14/node1/Makefile.am
+++ b/testsuites/ada/mptests/mp14/node1/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp14_ada_mp14_node1
 mp14_ada_mp14_node1_SOURCES = mp14_node1.adb ../mptest.adb config.h
 mp14_ada_mp14_node1_SOURCES += ../mptest.ads
-mp14_ada_mp14_node1_SOURCES += ../../../support/init.c
+mp14_ada_mp14_node1_SOURCES += init.c
 
 mp14_ada_mp14_node1$(EXEEXT): mp14_node1.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp01/node1/config.h b/testsuites/ada/mptests/mp14/node1/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp01/node1/config.h
rename to testsuites/ada/mptests/mp14/node1/init.c
diff --git a/testsuites/ada/mptests/mp14/node2/Makefile.am b/testsuites/ada/mptests/mp14/node2/Makefile.am
index ceda2b7..2e0e9a3 100644
--- a/testsuites/ada/mptests/mp14/node2/Makefile.am
+++ b/testsuites/ada/mptests/mp14/node2/Makefile.am
@@ -8,7 +8,7 @@ AM_ADAFLAGS += -I$(srcdir)/..
 noinst_PROGRAMS = mp14_ada_mp14_node2
 mp14_ada_mp14_node2_SOURCES = mp14_node2.adb ../mptest.adb config.h
 mp14_ada_mp14_node2_SOURCES += ../mptest.ads
-mp14_ada_mp14_node2_SOURCES += ../../../support/init.c
+mp14_ada_mp14_node2_SOURCES += init.c
 
 mp14_ada_mp14_node2$(EXEEXT): mp14_node2.adb ../mptest.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/mptests/mp01/node2/config.h b/testsuites/ada/mptests/mp14/node2/init.c
similarity index 100%
rename from testsuites/ada/mptests/mp01/node2/config.h
rename to testsuites/ada/mptests/mp14/node2/init.c
diff --git a/testsuites/ada/samples/base_mp/config.h b/testsuites/ada/samples/base_mp/init.c
similarity index 96%
rename from testsuites/ada/samples/base_mp/config.h
rename to testsuites/ada/samples/base_mp/init.c
index 2d0e654..78a357b 100644
--- a/testsuites/ada/samples/base_mp/config.h
+++ b/testsuites/ada/samples/base_mp/init.c
@@ -31,6 +31,6 @@
  *  Put the overrides of default configuration parameters here.
  */
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/samples/base_sp/Makefile.am b/testsuites/ada/samples/base_sp/Makefile.am
index 10b0709..e1e0731 100644
--- a/testsuites/ada/samples/base_sp/Makefile.am
+++ b/testsuites/ada/samples/base_sp/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/ada.am
 ada_base_sp$(EXEEXT): base_sp.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-init.$(OBJEXT): ../../support/init.c
+init.$(OBJEXT): init.c
 	$(COMPILE.c) $(AM_CPPFLAGS) -I$(srcdir) -c $<
 
 noinst_PROGRAMS = ada_base_sp
diff --git a/testsuites/ada/samples/base_sp/config.h b/testsuites/ada/samples/base_sp/init.c
similarity index 95%
rename from testsuites/ada/samples/base_sp/config.h
rename to testsuites/ada/samples/base_sp/init.c
index 152eb56..1ad2d67 100644
--- a/testsuites/ada/samples/base_sp/config.h
+++ b/testsuites/ada/samples/base_sp/init.c
@@ -25,6 +25,6 @@
 
 #define ADA_TEST_NAME "ADA BASE SP"
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/samples/hello/Makefile.am b/testsuites/ada/samples/hello/Makefile.am
index 9efde90..3e3fefc 100644
--- a/testsuites/ada/samples/hello/Makefile.am
+++ b/testsuites/ada/samples/hello/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/ada.am
 ada_hello$(EXEEXT): hello.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-init.$(OBJEXT): ../../support/init.c
+init.$(OBJEXT): init.c
 	$(COMPILE.c) $(AM_CPPFLAGS) -I$(srcdir) -c $<
 
 noinst_PROGRAMS = ada_hello
diff --git a/testsuites/ada/samples/hello/config.h b/testsuites/ada/samples/hello/init.c
similarity index 95%
rename from testsuites/ada/samples/hello/config.h
rename to testsuites/ada/samples/hello/init.c
index 3b4a9f4..f7c3f4f 100644
--- a/testsuites/ada/samples/hello/config.h
+++ b/testsuites/ada/samples/hello/init.c
@@ -28,6 +28,6 @@
 
 #define ADA_TEST_NAME "ADA HELLO"
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/samples/nsecs/Makefile.am b/testsuites/ada/samples/nsecs/Makefile.am
index 21e27b4..d4fae4a 100644
--- a/testsuites/ada/samples/nsecs/Makefile.am
+++ b/testsuites/ada/samples/nsecs/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/ada.am
 ada_nsecs$(EXEEXT): nsecs.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-init.$(OBJEXT): ../../support/init.c
+init.$(OBJEXT): init.c
 	$(COMPILE.c) $(AM_CPPFLAGS) -I$(srcdir) -c $<
 
 noinst_PROGRAMS = ada_nsecs
diff --git a/testsuites/ada/samples/nsecs/config.h b/testsuites/ada/samples/nsecs/init.c
similarity index 95%
rename from testsuites/ada/samples/nsecs/config.h
rename to testsuites/ada/samples/nsecs/init.c
index 61cb8c7..3935e10 100644
--- a/testsuites/ada/samples/nsecs/config.h
+++ b/testsuites/ada/samples/nsecs/init.c
@@ -27,6 +27,6 @@
 
 #define ADA_TEST_NAME "ADA NSECS"
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/samples/ticker/Makefile.am b/testsuites/ada/samples/ticker/Makefile.am
index c000abd..3da9a58 100644
--- a/testsuites/ada/samples/ticker/Makefile.am
+++ b/testsuites/ada/samples/ticker/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/ada.am
 ada_ticker$(EXEEXT): ticker.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-init.$(OBJEXT): ../../support/init.c
+init.$(OBJEXT): init.c
 	$(COMPILE.c) $(AM_CPPFLAGS) -I$(srcdir) -c $<
 
 noinst_PROGRAMS = ada_ticker
diff --git a/testsuites/ada/samples/ticker/config.h b/testsuites/ada/samples/ticker/init.c
similarity index 95%
rename from testsuites/ada/samples/ticker/config.h
rename to testsuites/ada/samples/ticker/init.c
index 3edc776..e6f82f2 100644
--- a/testsuites/ada/samples/ticker/config.h
+++ b/testsuites/ada/samples/ticker/init.c
@@ -25,6 +25,6 @@
 
 #define ADA_TEST_NAME "ADA TICKER"
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp01/Makefile.am b/testsuites/ada/sptests/sp01/Makefile.am
index 62b1e6f..baa2d66 100644
--- a/testsuites/ada/sptests/sp01/Makefile.am
+++ b/testsuites/ada/sptests/sp01/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_sp01
 ada_sp01_SOURCES = sp01.adb config.h sptest.adb sptest.ads
-ada_sp01_SOURCES += ../../support/init.c
+ada_sp01_SOURCES += init.c
 
 ada_sp01$(EXEEXT): sp01.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/sptests/sp01/config.h b/testsuites/ada/sptests/sp01/init.c
similarity index 95%
rename from testsuites/ada/sptests/sp01/config.h
rename to testsuites/ada/sptests/sp01/init.c
index ee9e0fb..dc5f4fc 100644
--- a/testsuites/ada/sptests/sp01/config.h
+++ b/testsuites/ada/sptests/sp01/init.c
@@ -25,6 +25,6 @@
 
 #define ADA_TEST_NAME "ADA SP 1"
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp02/Makefile.am b/testsuites/ada/sptests/sp02/Makefile.am
index 2c82e1e..74bfd0f 100644
--- a/testsuites/ada/sptests/sp02/Makefile.am
+++ b/testsuites/ada/sptests/sp02/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_sp02
 ada_sp02_SOURCES = sp02.adb config.h sptest.adb sptest.ads
-ada_sp02_SOURCES += ../../support/init.c
+ada_sp02_SOURCES += init.c
 
 ada_sp02$(EXEEXT): sp02.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/sptests/sp02/config.h b/testsuites/ada/sptests/sp02/init.c
similarity index 95%
rename from testsuites/ada/sptests/sp02/config.h
rename to testsuites/ada/sptests/sp02/init.c
index 60f58c1..51801f6 100644
--- a/testsuites/ada/sptests/sp02/config.h
+++ b/testsuites/ada/sptests/sp02/init.c
@@ -25,6 +25,6 @@
 
 #define ADA_TEST_NAME "ADA SP 2"
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp03/Makefile.am b/testsuites/ada/sptests/sp03/Makefile.am
index 6e6a502..e7656e9 100644
--- a/testsuites/ada/sptests/sp03/Makefile.am
+++ b/testsuites/ada/sptests/sp03/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_sp03
 ada_sp03_SOURCES = sp03.adb config.h sptest.adb sptest.ads
-ada_sp03_SOURCES += ../../support/init.c
+ada_sp03_SOURCES += init.c
 
 ada_sp03$(EXEEXT): sp03.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/sptests/sp03/config.h b/testsuites/ada/sptests/sp03/init.c
similarity index 95%
rename from testsuites/ada/sptests/sp03/config.h
rename to testsuites/ada/sptests/sp03/init.c
index 0c7507a..6da581e 100644
--- a/testsuites/ada/sptests/sp03/config.h
+++ b/testsuites/ada/sptests/sp03/init.c
@@ -25,6 +25,6 @@
 
 #define ADA_TEST_NAME "ADA SP 3"
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp04/Makefile.am b/testsuites/ada/sptests/sp04/Makefile.am
index a9e6f4c..d1c07e8 100644
--- a/testsuites/ada/sptests/sp04/Makefile.am
+++ b/testsuites/ada/sptests/sp04/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_sp04
 ada_sp04_SOURCES = sp04.adb config.h sptest.adb sptest.ads
-ada_sp04_SOURCES += ../../support/init.c
+ada_sp04_SOURCES += init.c
 
 ada_sp04$(EXEEXT): sp04.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/sptests/sp04/config.h b/testsuites/ada/sptests/sp04/init.c
similarity index 95%
rename from testsuites/ada/sptests/sp04/config.h
rename to testsuites/ada/sptests/sp04/init.c
index 8fccddb..c55a103 100644
--- a/testsuites/ada/sptests/sp04/config.h
+++ b/testsuites/ada/sptests/sp04/init.c
@@ -28,6 +28,6 @@
 
 #define ADA_TEST_NAME "ADA SP 4"
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp05/Makefile.am b/testsuites/ada/sptests/sp05/Makefile.am
index 8ace676..4330da6 100644
--- a/testsuites/ada/sptests/sp05/Makefile.am
+++ b/testsuites/ada/sptests/sp05/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_sp05
 ada_sp05_SOURCES = sp05.adb config.h sptest.adb sptest.ads
-ada_sp05_SOURCES += ../../support/init.c
+ada_sp05_SOURCES += init.c
 
 ada_sp05$(EXEEXT): sp05.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/sptests/sp05/config.h b/testsuites/ada/sptests/sp05/init.c
similarity index 95%
rename from testsuites/ada/sptests/sp05/config.h
rename to testsuites/ada/sptests/sp05/init.c
index d5ddc1d..048edae 100644
--- a/testsuites/ada/sptests/sp05/config.h
+++ b/testsuites/ada/sptests/sp05/init.c
@@ -27,6 +27,6 @@
 
 #define ADA_TEST_NAME "ADA SP 5"
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp06/Makefile.am b/testsuites/ada/sptests/sp06/Makefile.am
index 0cc703a..7ca252d 100644
--- a/testsuites/ada/sptests/sp06/Makefile.am
+++ b/testsuites/ada/sptests/sp06/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_sp06
 ada_sp06_SOURCES = sp06.adb config.h sptest.adb sptest.ads
-ada_sp06_SOURCES += ../../support/init.c
+ada_sp06_SOURCES += init.c
 
 ada_sp06$(EXEEXT): sp06.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/sptests/sp06/config.h b/testsuites/ada/sptests/sp06/init.c
similarity index 95%
rename from testsuites/ada/sptests/sp06/config.h
rename to testsuites/ada/sptests/sp06/init.c
index 492e0e6..b37a6a4 100644
--- a/testsuites/ada/sptests/sp06/config.h
+++ b/testsuites/ada/sptests/sp06/init.c
@@ -27,6 +27,6 @@
 
 #define ADA_TEST_NAME "ADA SP 6"
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp07/Makefile.am b/testsuites/ada/sptests/sp07/Makefile.am
index 8ce5e22..321017c 100644
--- a/testsuites/ada/sptests/sp07/Makefile.am
+++ b/testsuites/ada/sptests/sp07/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/ada.am
 noinst_PROGRAMS = ada_sp07
 
 ada_sp07_SOURCES = sp07.adb config.h sptest.adb sptest.ads
-ada_sp07_SOURCES += ../../support/init.c
+ada_sp07_SOURCES += init.c
 
 ada_sp07$(EXEEXT): sp07.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/sptests/sp07/config.h b/testsuites/ada/sptests/sp07/init.c
similarity index 95%
rename from testsuites/ada/sptests/sp07/config.h
rename to testsuites/ada/sptests/sp07/init.c
index ffdac2d..c47213e 100644
--- a/testsuites/ada/sptests/sp07/config.h
+++ b/testsuites/ada/sptests/sp07/init.c
@@ -28,6 +28,6 @@
 
 #define ADA_TEST_NAME "ADA SP 7"
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp08/Makefile.am b/testsuites/ada/sptests/sp08/Makefile.am
index 5c9d5d8..4380e7b 100644
--- a/testsuites/ada/sptests/sp08/Makefile.am
+++ b/testsuites/ada/sptests/sp08/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_sp08
 ada_sp08_SOURCES = sp08.adb config.h sptest.adb sptest.ads
-ada_sp08_SOURCES += ../../support/init.c
+ada_sp08_SOURCES += init.c
 
 ada_sp08$(EXEEXT): sp08.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/sptests/sp08/config.h b/testsuites/ada/sptests/sp08/init.c
similarity index 95%
rename from testsuites/ada/sptests/sp08/config.h
rename to testsuites/ada/sptests/sp08/init.c
index af91757..328e3ee 100644
--- a/testsuites/ada/sptests/sp08/config.h
+++ b/testsuites/ada/sptests/sp08/init.c
@@ -27,6 +27,6 @@
 
 #define ADA_TEST_NAME "ADA SP 8"
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp09/Makefile.am b/testsuites/ada/sptests/sp09/Makefile.am
index c625d70..e24f969 100644
--- a/testsuites/ada/sptests/sp09/Makefile.am
+++ b/testsuites/ada/sptests/sp09/Makefile.am
@@ -10,7 +10,7 @@ AM_ADAFLAGS += -gnatp
 noinst_PROGRAMS = ada_sp09
 
 ada_sp09_SOURCES = sp09.adb config.h sptest.adb sptest.ads
-ada_sp09_SOURCES += ../../support/init.c
+ada_sp09_SOURCES += init.c
 
 ada_sp09$(EXEEXT): sp09.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/sptests/sp09/config.h b/testsuites/ada/sptests/sp09/init.c
similarity index 96%
rename from testsuites/ada/sptests/sp09/config.h
rename to testsuites/ada/sptests/sp09/init.c
index 4d96170..534dccd 100644
--- a/testsuites/ada/sptests/sp09/config.h
+++ b/testsuites/ada/sptests/sp09/init.c
@@ -33,6 +33,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp11/Makefile.am b/testsuites/ada/sptests/sp11/Makefile.am
index e900713..0c80d39 100644
--- a/testsuites/ada/sptests/sp11/Makefile.am
+++ b/testsuites/ada/sptests/sp11/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_sp11
 ada_sp11_SOURCES = sp11.adb config.h sptest.adb sptest.ads
-ada_sp11_SOURCES += ../../support/init.c
+ada_sp11_SOURCES += init.c
 
 ada_sp11$(EXEEXT): sp11.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/sptests/sp11/config.h b/testsuites/ada/sptests/sp11/init.c
similarity index 95%
rename from testsuites/ada/sptests/sp11/config.h
rename to testsuites/ada/sptests/sp11/init.c
index 508613e..edd86bc 100644
--- a/testsuites/ada/sptests/sp11/config.h
+++ b/testsuites/ada/sptests/sp11/init.c
@@ -27,6 +27,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp12/Makefile.am b/testsuites/ada/sptests/sp12/Makefile.am
index fce1a0e..0fcb25f 100644
--- a/testsuites/ada/sptests/sp12/Makefile.am
+++ b/testsuites/ada/sptests/sp12/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_sp12
 ada_sp12_SOURCES = sp12.adb config.h sptest.adb sptest.ads
-ada_sp12_SOURCES += ../../support/init.c
+ada_sp12_SOURCES += init.c
 
 ada_sp12$(EXEEXT): sp12.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/sptests/sp12/config.h b/testsuites/ada/sptests/sp12/init.c
similarity index 95%
rename from testsuites/ada/sptests/sp12/config.h
rename to testsuites/ada/sptests/sp12/init.c
index 8edb8ba..4dc8aad 100644
--- a/testsuites/ada/sptests/sp12/config.h
+++ b/testsuites/ada/sptests/sp12/init.c
@@ -27,6 +27,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp13/Makefile.am b/testsuites/ada/sptests/sp13/Makefile.am
index 01a6021..7ca7fb6 100644
--- a/testsuites/ada/sptests/sp13/Makefile.am
+++ b/testsuites/ada/sptests/sp13/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_sp13
 ada_sp13_SOURCES = sp13.adb config.h sptest.adb sptest.ads
-ada_sp13_SOURCES += ../../support/init.c
+ada_sp13_SOURCES += init.c
 
 ada_sp13$(EXEEXT): sp13.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/sptests/sp13/config.h b/testsuites/ada/sptests/sp13/init.c
similarity index 95%
rename from testsuites/ada/sptests/sp13/config.h
rename to testsuites/ada/sptests/sp13/init.c
index 2d6dd34..13f9fc2 100644
--- a/testsuites/ada/sptests/sp13/config.h
+++ b/testsuites/ada/sptests/sp13/init.c
@@ -27,6 +27,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp14/Makefile.am b/testsuites/ada/sptests/sp14/Makefile.am
index 2b6c12a..5874c26 100644
--- a/testsuites/ada/sptests/sp14/Makefile.am
+++ b/testsuites/ada/sptests/sp14/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_sp14
 ada_sp14_SOURCES = sp14.adb config.h sptest.adb sptest.ads
-ada_sp14_SOURCES += ../../support/init.c
+ada_sp14_SOURCES += init.c
 
 ada_sp14$(EXEEXT): sp14.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/sptests/sp14/config.h b/testsuites/ada/sptests/sp14/init.c
similarity index 95%
rename from testsuites/ada/sptests/sp14/config.h
rename to testsuites/ada/sptests/sp14/init.c
index 2a53074..076e3d9 100644
--- a/testsuites/ada/sptests/sp14/config.h
+++ b/testsuites/ada/sptests/sp14/init.c
@@ -27,6 +27,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp15/Makefile.am b/testsuites/ada/sptests/sp15/Makefile.am
index 9462600..9e1b6b8 100644
--- a/testsuites/ada/sptests/sp15/Makefile.am
+++ b/testsuites/ada/sptests/sp15/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_sp15
 ada_sp15_SOURCES = sp15.adb config.h sptest.adb sptest.ads
-ada_sp15_SOURCES += ../../support/init.c
+ada_sp15_SOURCES += init.c
 
 ada_sp15$(EXEEXT): sp15.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/sptests/sp15/config.h b/testsuites/ada/sptests/sp15/init.c
similarity index 95%
rename from testsuites/ada/sptests/sp15/config.h
rename to testsuites/ada/sptests/sp15/init.c
index b0d535c..6b1b1f3 100644
--- a/testsuites/ada/sptests/sp15/config.h
+++ b/testsuites/ada/sptests/sp15/init.c
@@ -27,6 +27,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp16/Makefile.am b/testsuites/ada/sptests/sp16/Makefile.am
index 82576fc..b0bb223 100644
--- a/testsuites/ada/sptests/sp16/Makefile.am
+++ b/testsuites/ada/sptests/sp16/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_sp16
 ada_sp16_SOURCES = sp16.adb config.h sptest.adb sptest.ads
-ada_sp16_SOURCES += ../../support/init.c
+ada_sp16_SOURCES += init.c
 
 ada_sp16$(EXEEXT): sp16.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/sptests/sp16/config.h b/testsuites/ada/sptests/sp16/init.c
similarity index 95%
rename from testsuites/ada/sptests/sp16/config.h
rename to testsuites/ada/sptests/sp16/init.c
index c507336..c0a75da 100644
--- a/testsuites/ada/sptests/sp16/config.h
+++ b/testsuites/ada/sptests/sp16/init.c
@@ -27,6 +27,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp17/Makefile.am b/testsuites/ada/sptests/sp17/Makefile.am
index 8357d1c..142cbd3 100644
--- a/testsuites/ada/sptests/sp17/Makefile.am
+++ b/testsuites/ada/sptests/sp17/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_sp17
 ada_sp17_SOURCES = sp17.adb config.h sptest.adb sptest.ads
-ada_sp17_SOURCES += ../../support/init.c
+ada_sp17_SOURCES += init.c
 
 ada_sp17$(EXEEXT): sp17.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/sptests/sp17/config.h b/testsuites/ada/sptests/sp17/init.c
similarity index 95%
rename from testsuites/ada/sptests/sp17/config.h
rename to testsuites/ada/sptests/sp17/init.c
index 9813e25..7dfd620 100644
--- a/testsuites/ada/sptests/sp17/config.h
+++ b/testsuites/ada/sptests/sp17/init.c
@@ -27,6 +27,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp19/Makefile.am b/testsuites/ada/sptests/sp19/Makefile.am
index 8a38c8c..27604b1 100644
--- a/testsuites/ada/sptests/sp19/Makefile.am
+++ b/testsuites/ada/sptests/sp19/Makefile.am
@@ -7,7 +7,7 @@ AM_ADAFLAGS += -I.
 
 noinst_PROGRAMS = ada_sp19
 ada_sp19_SOURCES = sp19.adb sptest.adb config.h sptest.ads
-ada_sp19_SOURCES += ../../support/init.c
+ada_sp19_SOURCES += init.c
 
 CLEANFILES += sptest.adb
 
diff --git a/testsuites/ada/sptests/sp19/config.h b/testsuites/ada/sptests/sp19/init.c
similarity index 95%
rename from testsuites/ada/sptests/sp19/config.h
rename to testsuites/ada/sptests/sp19/init.c
index 1cdc8a0..2d0d5b3 100644
--- a/testsuites/ada/sptests/sp19/config.h
+++ b/testsuites/ada/sptests/sp19/init.c
@@ -25,6 +25,6 @@
 
 #define ADA_TEST_NAME "ADA SP 19"
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp20/Makefile.am b/testsuites/ada/sptests/sp20/Makefile.am
index 7b22ec8..a298575 100644
--- a/testsuites/ada/sptests/sp20/Makefile.am
+++ b/testsuites/ada/sptests/sp20/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_sp20
 ada_sp20_SOURCES = sp20.adb config.h sptest.adb sptest.ads
-ada_sp20_SOURCES += ../../support/init.c
+ada_sp20_SOURCES += init.c
 
 ada_sp20$(EXEEXT): sp20.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/sptests/sp20/config.h b/testsuites/ada/sptests/sp20/init.c
similarity index 95%
rename from testsuites/ada/sptests/sp20/config.h
rename to testsuites/ada/sptests/sp20/init.c
index 55990e2..7146c3f 100644
--- a/testsuites/ada/sptests/sp20/config.h
+++ b/testsuites/ada/sptests/sp20/init.c
@@ -26,6 +26,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp22/Makefile.am b/testsuites/ada/sptests/sp22/Makefile.am
index dfdce80..94407e1 100644
--- a/testsuites/ada/sptests/sp22/Makefile.am
+++ b/testsuites/ada/sptests/sp22/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_sp22
 ada_sp22_SOURCES = sp22.adb config.h sptest.adb sptest.ads
-ada_sp22_SOURCES += ../../support/init.c
+ada_sp22_SOURCES += init.c
 
 ada_sp22$(EXEEXT): sp22.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/sptests/sp22/config.h b/testsuites/ada/sptests/sp22/init.c
similarity index 95%
rename from testsuites/ada/sptests/sp22/config.h
rename to testsuites/ada/sptests/sp22/init.c
index da60e49..6ebc1b9 100644
--- a/testsuites/ada/sptests/sp22/config.h
+++ b/testsuites/ada/sptests/sp22/init.c
@@ -26,6 +26,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp23/Makefile.am b/testsuites/ada/sptests/sp23/Makefile.am
index 64c7746..3a19f57 100644
--- a/testsuites/ada/sptests/sp23/Makefile.am
+++ b/testsuites/ada/sptests/sp23/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_sp23
 ada_sp23_SOURCES = sp23.adb config.h sptest.adb sptest.ads
-ada_sp23_SOURCES += ../../support/init.c
+ada_sp23_SOURCES += init.c
 
 ada_sp23$(EXEEXT): sp23.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/sptests/sp23/config.h b/testsuites/ada/sptests/sp23/init.c
similarity index 95%
rename from testsuites/ada/sptests/sp23/config.h
rename to testsuites/ada/sptests/sp23/init.c
index 5af9f62..76e5f7b 100644
--- a/testsuites/ada/sptests/sp23/config.h
+++ b/testsuites/ada/sptests/sp23/init.c
@@ -26,6 +26,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp24/Makefile.am b/testsuites/ada/sptests/sp24/Makefile.am
index 7d9cbc8..2170468 100644
--- a/testsuites/ada/sptests/sp24/Makefile.am
+++ b/testsuites/ada/sptests/sp24/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_sp24
 ada_sp24_SOURCES = sp24.adb config.h sptest.adb sptest.ads
-ada_sp24_SOURCES += ../../support/init.c
+ada_sp24_SOURCES += init.c
 
 ada_sp24$(EXEEXT): sp24.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/sptests/sp24/config.h b/testsuites/ada/sptests/sp24/init.c
similarity index 95%
rename from testsuites/ada/sptests/sp24/config.h
rename to testsuites/ada/sptests/sp24/init.c
index ee18ff3..3989b42 100644
--- a/testsuites/ada/sptests/sp24/config.h
+++ b/testsuites/ada/sptests/sp24/init.c
@@ -26,6 +26,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/sp25/Makefile.am b/testsuites/ada/sptests/sp25/Makefile.am
index 7cef185..b603e43 100644
--- a/testsuites/ada/sptests/sp25/Makefile.am
+++ b/testsuites/ada/sptests/sp25/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_sp25
 ada_sp25_SOURCES = sp25.adb config.h sptest.adb sptest.ads
-ada_sp25_SOURCES += ../../support/init.c
+ada_sp25_SOURCES += init.c
 
 ada_sp25$(EXEEXT): sp25.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/sptests/sp25/config.h b/testsuites/ada/sptests/sp25/init.c
similarity index 95%
rename from testsuites/ada/sptests/sp25/config.h
rename to testsuites/ada/sptests/sp25/init.c
index d7c6c19..8004204 100644
--- a/testsuites/ada/sptests/sp25/config.h
+++ b/testsuites/ada/sptests/sp25/init.c
@@ -26,6 +26,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/sptests/spatcb01/Makefile.am b/testsuites/ada/sptests/spatcb01/Makefile.am
index b27c692..1edd898 100644
--- a/testsuites/ada/sptests/spatcb01/Makefile.am
+++ b/testsuites/ada/sptests/spatcb01/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_spatcb01
 ada_spatcb01_SOURCES = spatcb01.adb config.h
-ada_spatcb01_SOURCES += ../../support/init.c
+ada_spatcb01_SOURCES += init.c
 
 ada_spatcb01$(EXEEXT): spatcb01.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/sptests/spatcb01/config.h b/testsuites/ada/sptests/spatcb01/init.c
similarity index 92%
rename from testsuites/ada/sptests/spatcb01/config.h
rename to testsuites/ada/sptests/spatcb01/init.c
index dad989d..38c5fc5 100644
--- a/testsuites/ada/sptests/spatcb01/config.h
+++ b/testsuites/ada/sptests/spatcb01/init.c
@@ -15,4 +15,4 @@
 
 #define ADA_TEST_NAME "ADA SPATCB 1"
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
diff --git a/testsuites/ada/sptests/spname01/Makefile.am b/testsuites/ada/sptests/spname01/Makefile.am
index b3cf506..56d64a7 100644
--- a/testsuites/ada/sptests/spname01/Makefile.am
+++ b/testsuites/ada/sptests/spname01/Makefile.am
@@ -9,7 +9,7 @@ ada_spname01_SOURCES = spname01.adb config.h sptest.adb sptest.ads
 ada_spname01$(EXEEXT): spname01.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
 
-init.$(OBJEXT): ../../support/init.c
+init.$(OBJEXT): init.c
 	$(COMPILE.c) $(AM_CPPFLAGS) -I$(srcdir) -c $<
 
 scndir = $(rtems_ada_testsdir)
diff --git a/testsuites/ada/sptests/spname01/config.h b/testsuites/ada/sptests/spname01/init.c
similarity index 95%
rename from testsuites/ada/sptests/spname01/config.h
rename to testsuites/ada/sptests/spname01/init.c
index 8316f41..334b6ca 100644
--- a/testsuites/ada/sptests/spname01/config.h
+++ b/testsuites/ada/sptests/spname01/init.c
@@ -28,6 +28,6 @@
 
 #define ADA_TEST_NAME "ADA SPNAME 1"
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/support/init.c b/testsuites/ada/support/initimpl.h
similarity index 99%
rename from testsuites/ada/support/init.c
rename to testsuites/ada/support/initimpl.h
index c9a2327..35739d8 100644
--- a/testsuites/ada/support/init.c
+++ b/testsuites/ada/support/initimpl.h
@@ -53,7 +53,7 @@ void check_type(long type, long size, long alignment);
 
 #define CONFIGURE_DISABLE_SMP_CONFIGURATION
 
-#include <config.h>
+#include <rtems/confdefs.h>
 
 const char rtems_test_name[] = ADA_TEST_NAME;
 
diff --git a/testsuites/ada/tmtests/tm01/Makefile.am b/testsuites/ada/tmtests/tm01/Makefile.am
index 249b65d..1d854ca 100644
--- a/testsuites/ada/tmtests/tm01/Makefile.am
+++ b/testsuites/ada/tmtests/tm01/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm01
 ada_tm01_SOURCES = tm01.adb config.h tmtest.adb tmtest.ads
-ada_tm01_SOURCES += ../../support/init.c
+ada_tm01_SOURCES += init.c
 
 ada_tm01$(EXEEXT): tm01.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm01/config.h b/testsuites/ada/tmtests/tm01/init.c
similarity index 95%
rename from testsuites/ada/tmtests/tm01/config.h
rename to testsuites/ada/tmtests/tm01/init.c
index b2a0576..8f2fb49 100644
--- a/testsuites/ada/tmtests/tm01/config.h
+++ b/testsuites/ada/tmtests/tm01/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm02/Makefile.am b/testsuites/ada/tmtests/tm02/Makefile.am
index 3d4f79f..fe3f609 100644
--- a/testsuites/ada/tmtests/tm02/Makefile.am
+++ b/testsuites/ada/tmtests/tm02/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm02
 ada_tm02_SOURCES = tm02.adb config.h tmtest.adb tmtest.ads
-ada_tm02_SOURCES += ../../support/init.c
+ada_tm02_SOURCES += init.c
 
 ada_tm02$(EXEEXT): tm02.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm02/config.h b/testsuites/ada/tmtests/tm02/init.c
similarity index 96%
rename from testsuites/ada/tmtests/tm02/config.h
rename to testsuites/ada/tmtests/tm02/init.c
index 18a1ad7..d8123f0 100644
--- a/testsuites/ada/tmtests/tm02/config.h
+++ b/testsuites/ada/tmtests/tm02/init.c
@@ -30,6 +30,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm03/Makefile.am b/testsuites/ada/tmtests/tm03/Makefile.am
index 75032a2..89eb8d0 100644
--- a/testsuites/ada/tmtests/tm03/Makefile.am
+++ b/testsuites/ada/tmtests/tm03/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm03
 ada_tm03_SOURCES = tm03.adb config.h tmtest.adb tmtest.ads
-ada_tm03_SOURCES += ../../support/init.c
+ada_tm03_SOURCES += init.c
 
 ada_tm03$(EXEEXT): tm03.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm03/config.h b/testsuites/ada/tmtests/tm03/init.c
similarity index 96%
rename from testsuites/ada/tmtests/tm03/config.h
rename to testsuites/ada/tmtests/tm03/init.c
index 61daeb9..439c8ca 100644
--- a/testsuites/ada/tmtests/tm03/config.h
+++ b/testsuites/ada/tmtests/tm03/init.c
@@ -30,6 +30,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm04/Makefile.am b/testsuites/ada/tmtests/tm04/Makefile.am
index da74604..1120d2b 100644
--- a/testsuites/ada/tmtests/tm04/Makefile.am
+++ b/testsuites/ada/tmtests/tm04/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm04
 ada_tm04_SOURCES = tm04.adb config.h tmtest.adb tmtest.ads
-ada_tm04_SOURCES += ../../support/init.c
+ada_tm04_SOURCES += init.c
 
 ada_tm04$(EXEEXT): tm04.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm04/config.h b/testsuites/ada/tmtests/tm04/init.c
similarity index 95%
rename from testsuites/ada/tmtests/tm04/config.h
rename to testsuites/ada/tmtests/tm04/init.c
index 42f8aee..2cf05da 100644
--- a/testsuites/ada/tmtests/tm04/config.h
+++ b/testsuites/ada/tmtests/tm04/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm05/Makefile.am b/testsuites/ada/tmtests/tm05/Makefile.am
index 99829f3..ce88c76 100644
--- a/testsuites/ada/tmtests/tm05/Makefile.am
+++ b/testsuites/ada/tmtests/tm05/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm05
 ada_tm05_SOURCES = tm05.adb config.h tmtest.adb tmtest.ads
-ada_tm05_SOURCES += ../../support/init.c
+ada_tm05_SOURCES += init.c
 
 ada_tm05$(EXEEXT): tm05.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm05/config.h b/testsuites/ada/tmtests/tm05/init.c
similarity index 96%
rename from testsuites/ada/tmtests/tm05/config.h
rename to testsuites/ada/tmtests/tm05/init.c
index 7b56b81..7fb0f85 100644
--- a/testsuites/ada/tmtests/tm05/config.h
+++ b/testsuites/ada/tmtests/tm05/init.c
@@ -30,6 +30,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm06/Makefile.am b/testsuites/ada/tmtests/tm06/Makefile.am
index 5dea7d4..de26a58 100644
--- a/testsuites/ada/tmtests/tm06/Makefile.am
+++ b/testsuites/ada/tmtests/tm06/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm06
 ada_tm06_SOURCES = tm06.adb config.h tmtest.adb tmtest.ads
-ada_tm06_SOURCES += ../../support/init.c
+ada_tm06_SOURCES += init.c
 
 ada_tm06$(EXEEXT): tm06.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm06/config.h b/testsuites/ada/tmtests/tm06/init.c
similarity index 96%
rename from testsuites/ada/tmtests/tm06/config.h
rename to testsuites/ada/tmtests/tm06/init.c
index c8ae6d5..88f27f6 100644
--- a/testsuites/ada/tmtests/tm06/config.h
+++ b/testsuites/ada/tmtests/tm06/init.c
@@ -30,6 +30,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm07/Makefile.am b/testsuites/ada/tmtests/tm07/Makefile.am
index 2507454..de21b00 100644
--- a/testsuites/ada/tmtests/tm07/Makefile.am
+++ b/testsuites/ada/tmtests/tm07/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm07
 ada_tm07_SOURCES = tm07.adb config.h tmtest.adb tmtest.ads
-ada_tm07_SOURCES += ../../support/init.c
+ada_tm07_SOURCES += init.c
 
 ada_tm07$(EXEEXT): tm07.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm07/config.h b/testsuites/ada/tmtests/tm07/init.c
similarity index 96%
rename from testsuites/ada/tmtests/tm07/config.h
rename to testsuites/ada/tmtests/tm07/init.c
index f6ca20e..dcbf73a 100644
--- a/testsuites/ada/tmtests/tm07/config.h
+++ b/testsuites/ada/tmtests/tm07/init.c
@@ -30,6 +30,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm08/Makefile.am b/testsuites/ada/tmtests/tm08/Makefile.am
index 0e21c0d..77dc7e1 100644
--- a/testsuites/ada/tmtests/tm08/Makefile.am
+++ b/testsuites/ada/tmtests/tm08/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm08
 ada_tm08_SOURCES = tm08.adb config.h tmtest.adb tmtest.ads
-ada_tm08_SOURCES += ../../support/init.c
+ada_tm08_SOURCES += init.c
 
 ada_tm08$(EXEEXT): tm08.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm08/config.h b/testsuites/ada/tmtests/tm08/init.c
similarity index 96%
rename from testsuites/ada/tmtests/tm08/config.h
rename to testsuites/ada/tmtests/tm08/init.c
index 1c6324f..ded1a2e 100644
--- a/testsuites/ada/tmtests/tm08/config.h
+++ b/testsuites/ada/tmtests/tm08/init.c
@@ -30,6 +30,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm09/Makefile.am b/testsuites/ada/tmtests/tm09/Makefile.am
index c18e062..d5c0df3 100644
--- a/testsuites/ada/tmtests/tm09/Makefile.am
+++ b/testsuites/ada/tmtests/tm09/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm09
 ada_tm09_SOURCES = tm09.adb config.h tmtest.adb tmtest.ads
-ada_tm09_SOURCES += ../../support/init.c
+ada_tm09_SOURCES += init.c
 
 ada_tm09$(EXEEXT): tm09.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm09/config.h b/testsuites/ada/tmtests/tm09/init.c
similarity index 95%
rename from testsuites/ada/tmtests/tm09/config.h
rename to testsuites/ada/tmtests/tm09/init.c
index c14f17c..0db14c4 100644
--- a/testsuites/ada/tmtests/tm09/config.h
+++ b/testsuites/ada/tmtests/tm09/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm10/Makefile.am b/testsuites/ada/tmtests/tm10/Makefile.am
index aa9b23f..6ea9e25 100644
--- a/testsuites/ada/tmtests/tm10/Makefile.am
+++ b/testsuites/ada/tmtests/tm10/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm10
 ada_tm10_SOURCES = tm10.adb config.h tmtest.adb tmtest.ads
-ada_tm10_SOURCES += ../../support/init.c
+ada_tm10_SOURCES += init.c
 
 ada_tm10$(EXEEXT): tm10.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm10/config.h b/testsuites/ada/tmtests/tm10/init.c
similarity index 95%
rename from testsuites/ada/tmtests/tm10/config.h
rename to testsuites/ada/tmtests/tm10/init.c
index fd96463..3c3c526 100644
--- a/testsuites/ada/tmtests/tm10/config.h
+++ b/testsuites/ada/tmtests/tm10/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm11/Makefile.am b/testsuites/ada/tmtests/tm11/Makefile.am
index 57f30eb..6133b35 100644
--- a/testsuites/ada/tmtests/tm11/Makefile.am
+++ b/testsuites/ada/tmtests/tm11/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm11
 ada_tm11_SOURCES = tm11.adb config.h tmtest.adb tmtest.ads
-ada_tm11_SOURCES += ../../support/init.c
+ada_tm11_SOURCES += init.c
 
 ada_tm11$(EXEEXT): tm11.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm11/config.h b/testsuites/ada/tmtests/tm11/init.c
similarity index 95%
rename from testsuites/ada/tmtests/tm11/config.h
rename to testsuites/ada/tmtests/tm11/init.c
index e4ed6d1..93f4e1d 100644
--- a/testsuites/ada/tmtests/tm11/config.h
+++ b/testsuites/ada/tmtests/tm11/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm12/Makefile.am b/testsuites/ada/tmtests/tm12/Makefile.am
index a1b8205..3314b07 100644
--- a/testsuites/ada/tmtests/tm12/Makefile.am
+++ b/testsuites/ada/tmtests/tm12/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm12
 ada_tm12_SOURCES = tm12.adb config.h tmtest.adb tmtest.ads
-ada_tm12_SOURCES += ../../support/init.c
+ada_tm12_SOURCES += init.c
 
 ada_tm12$(EXEEXT): tm12.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm12/config.h b/testsuites/ada/tmtests/tm12/init.c
similarity index 95%
rename from testsuites/ada/tmtests/tm12/config.h
rename to testsuites/ada/tmtests/tm12/init.c
index 1d9df47..421e44f 100644
--- a/testsuites/ada/tmtests/tm12/config.h
+++ b/testsuites/ada/tmtests/tm12/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm13/Makefile.am b/testsuites/ada/tmtests/tm13/Makefile.am
index 8a0a8d9..1aed6de 100644
--- a/testsuites/ada/tmtests/tm13/Makefile.am
+++ b/testsuites/ada/tmtests/tm13/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm13
 ada_tm13_SOURCES = tm13.adb config.h tmtest.adb tmtest.ads
-ada_tm13_SOURCES += ../../support/init.c
+ada_tm13_SOURCES += init.c
 
 ada_tm13$(EXEEXT): tm13.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm13/config.h b/testsuites/ada/tmtests/tm13/init.c
similarity index 95%
rename from testsuites/ada/tmtests/tm13/config.h
rename to testsuites/ada/tmtests/tm13/init.c
index b05713d..ecf18b2 100644
--- a/testsuites/ada/tmtests/tm13/config.h
+++ b/testsuites/ada/tmtests/tm13/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm14/Makefile.am b/testsuites/ada/tmtests/tm14/Makefile.am
index d2cde84..d1be5e7 100644
--- a/testsuites/ada/tmtests/tm14/Makefile.am
+++ b/testsuites/ada/tmtests/tm14/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm14
 ada_tm14_SOURCES = tm14.adb config.h tmtest.adb tmtest.ads
-ada_tm14_SOURCES += ../../support/init.c
+ada_tm14_SOURCES += init.c
 
 ada_tm14$(EXEEXT): tm14.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm14/config.h b/testsuites/ada/tmtests/tm14/init.c
similarity index 95%
rename from testsuites/ada/tmtests/tm14/config.h
rename to testsuites/ada/tmtests/tm14/init.c
index ee8a005..3555139 100644
--- a/testsuites/ada/tmtests/tm14/config.h
+++ b/testsuites/ada/tmtests/tm14/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm15/Makefile.am b/testsuites/ada/tmtests/tm15/Makefile.am
index 9f94ba7..258d178 100644
--- a/testsuites/ada/tmtests/tm15/Makefile.am
+++ b/testsuites/ada/tmtests/tm15/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm15
 ada_tm15_SOURCES = tm15.adb config.h tmtest.adb tmtest.ads
-ada_tm15_SOURCES += ../../support/init.c
+ada_tm15_SOURCES += init.c
 
 ada_tm15$(EXEEXT): tm15.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm15/config.h b/testsuites/ada/tmtests/tm15/init.c
similarity index 95%
rename from testsuites/ada/tmtests/tm15/config.h
rename to testsuites/ada/tmtests/tm15/init.c
index 1753ca0..c1b831d 100644
--- a/testsuites/ada/tmtests/tm15/config.h
+++ b/testsuites/ada/tmtests/tm15/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm16/Makefile.am b/testsuites/ada/tmtests/tm16/Makefile.am
index 8b7595b..3fd0aa5 100644
--- a/testsuites/ada/tmtests/tm16/Makefile.am
+++ b/testsuites/ada/tmtests/tm16/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm16
 ada_tm16_SOURCES = tm16.adb config.h tmtest.adb tmtest.ads
-ada_tm16_SOURCES += ../../support/init.c
+ada_tm16_SOURCES += init.c
 
 ada_tm16$(EXEEXT): tm16.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm16/config.h b/testsuites/ada/tmtests/tm16/init.c
similarity index 95%
rename from testsuites/ada/tmtests/tm16/config.h
rename to testsuites/ada/tmtests/tm16/init.c
index 324be4e..64e613f 100644
--- a/testsuites/ada/tmtests/tm16/config.h
+++ b/testsuites/ada/tmtests/tm16/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm17/Makefile.am b/testsuites/ada/tmtests/tm17/Makefile.am
index 2e74d11..52c73aa 100644
--- a/testsuites/ada/tmtests/tm17/Makefile.am
+++ b/testsuites/ada/tmtests/tm17/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm17
 ada_tm17_SOURCES = tm17.adb config.h tmtest.adb tmtest.ads
-ada_tm17_SOURCES += ../../support/init.c
+ada_tm17_SOURCES += init.c
 
 ada_tm17$(EXEEXT): tm17.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm17/config.h b/testsuites/ada/tmtests/tm17/init.c
similarity index 95%
rename from testsuites/ada/tmtests/tm17/config.h
rename to testsuites/ada/tmtests/tm17/init.c
index 9eb0d0f..a411541 100644
--- a/testsuites/ada/tmtests/tm17/config.h
+++ b/testsuites/ada/tmtests/tm17/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm18/Makefile.am b/testsuites/ada/tmtests/tm18/Makefile.am
index a61ec0e..c583bb1 100644
--- a/testsuites/ada/tmtests/tm18/Makefile.am
+++ b/testsuites/ada/tmtests/tm18/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm18
 ada_tm18_SOURCES = tm18.adb config.h tmtest.adb tmtest.ads
-ada_tm18_SOURCES += ../../support/init.c
+ada_tm18_SOURCES += init.c
 
 ada_tm18$(EXEEXT): tm18.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm18/config.h b/testsuites/ada/tmtests/tm18/init.c
similarity index 95%
rename from testsuites/ada/tmtests/tm18/config.h
rename to testsuites/ada/tmtests/tm18/init.c
index cebc065..b9f6021 100644
--- a/testsuites/ada/tmtests/tm18/config.h
+++ b/testsuites/ada/tmtests/tm18/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm19/Makefile.am b/testsuites/ada/tmtests/tm19/Makefile.am
index f594559..ce882a6 100644
--- a/testsuites/ada/tmtests/tm19/Makefile.am
+++ b/testsuites/ada/tmtests/tm19/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm19
 ada_tm19_SOURCES = tm19.adb config.h tmtest.adb tmtest.ads
-ada_tm19_SOURCES += ../../support/init.c
+ada_tm19_SOURCES += init.c
 
 ada_tm19$(EXEEXT): tm19.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm19/config.h b/testsuites/ada/tmtests/tm19/init.c
similarity index 95%
rename from testsuites/ada/tmtests/tm19/config.h
rename to testsuites/ada/tmtests/tm19/init.c
index b41632e..5dda49a 100644
--- a/testsuites/ada/tmtests/tm19/config.h
+++ b/testsuites/ada/tmtests/tm19/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm20/Makefile.am b/testsuites/ada/tmtests/tm20/Makefile.am
index 71b7798..5080104 100644
--- a/testsuites/ada/tmtests/tm20/Makefile.am
+++ b/testsuites/ada/tmtests/tm20/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm20
 ada_tm20_SOURCES = tm20.adb config.h tmtest.adb tmtest.ads
-ada_tm20_SOURCES += ../../support/init.c
+ada_tm20_SOURCES += init.c
 
 ada_tm20$(EXEEXT): tm20.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm20/config.h b/testsuites/ada/tmtests/tm20/init.c
similarity index 96%
rename from testsuites/ada/tmtests/tm20/config.h
rename to testsuites/ada/tmtests/tm20/init.c
index 2085f4e..6c5481d 100644
--- a/testsuites/ada/tmtests/tm20/config.h
+++ b/testsuites/ada/tmtests/tm20/init.c
@@ -30,6 +30,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm21/Makefile.am b/testsuites/ada/tmtests/tm21/Makefile.am
index 92fb9b3..7910db0 100644
--- a/testsuites/ada/tmtests/tm21/Makefile.am
+++ b/testsuites/ada/tmtests/tm21/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm21
 ada_tm21_SOURCES = tm21.adb config.h tmtest.adb tmtest.ads
-ada_tm21_SOURCES += ../../support/init.c
+ada_tm21_SOURCES += init.c
 
 ada_tm21$(EXEEXT): tm21.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm21/config.h b/testsuites/ada/tmtests/tm21/init.c
similarity index 96%
rename from testsuites/ada/tmtests/tm21/config.h
rename to testsuites/ada/tmtests/tm21/init.c
index 1398cd6..a3646f3 100644
--- a/testsuites/ada/tmtests/tm21/config.h
+++ b/testsuites/ada/tmtests/tm21/init.c
@@ -35,6 +35,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm22/Makefile.am b/testsuites/ada/tmtests/tm22/Makefile.am
index b40061c..d042545 100644
--- a/testsuites/ada/tmtests/tm22/Makefile.am
+++ b/testsuites/ada/tmtests/tm22/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm22
 ada_tm22_SOURCES = tm22.adb config.h tmtest.adb tmtest.ads
-ada_tm22_SOURCES += ../../support/init.c
+ada_tm22_SOURCES += init.c
 
 ada_tm22$(EXEEXT): tm22.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm22/config.h b/testsuites/ada/tmtests/tm22/init.c
similarity index 95%
rename from testsuites/ada/tmtests/tm22/config.h
rename to testsuites/ada/tmtests/tm22/init.c
index 7da5388..368119d 100644
--- a/testsuites/ada/tmtests/tm22/config.h
+++ b/testsuites/ada/tmtests/tm22/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm23/Makefile.am b/testsuites/ada/tmtests/tm23/Makefile.am
index ab12b04..2541470 100644
--- a/testsuites/ada/tmtests/tm23/Makefile.am
+++ b/testsuites/ada/tmtests/tm23/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm23
 ada_tm23_SOURCES = tm23.adb config.h tmtest.adb tmtest.ads
-ada_tm23_SOURCES += ../../support/init.c
+ada_tm23_SOURCES += init.c
 
 ada_tm23$(EXEEXT): tm23.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm23/config.h b/testsuites/ada/tmtests/tm23/init.c
similarity index 95%
rename from testsuites/ada/tmtests/tm23/config.h
rename to testsuites/ada/tmtests/tm23/init.c
index 98fcf60..9ad2f69 100644
--- a/testsuites/ada/tmtests/tm23/config.h
+++ b/testsuites/ada/tmtests/tm23/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm24/Makefile.am b/testsuites/ada/tmtests/tm24/Makefile.am
index da6caa8..1130cbc 100644
--- a/testsuites/ada/tmtests/tm24/Makefile.am
+++ b/testsuites/ada/tmtests/tm24/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm24
 ada_tm24_SOURCES = tm24.adb config.h tmtest.adb tmtest.ads
-ada_tm24_SOURCES += ../../support/init.c
+ada_tm24_SOURCES += init.c
 
 ada_tm24$(EXEEXT): tm24.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm24/config.h b/testsuites/ada/tmtests/tm24/init.c
similarity index 95%
rename from testsuites/ada/tmtests/tm24/config.h
rename to testsuites/ada/tmtests/tm24/init.c
index 207ac7e..da98a9d 100644
--- a/testsuites/ada/tmtests/tm24/config.h
+++ b/testsuites/ada/tmtests/tm24/init.c
@@ -28,6 +28,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm25/Makefile.am b/testsuites/ada/tmtests/tm25/Makefile.am
index 77f2286..dfdc399 100644
--- a/testsuites/ada/tmtests/tm25/Makefile.am
+++ b/testsuites/ada/tmtests/tm25/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm25
 ada_tm25_SOURCES = tm25.adb config.h tmtest.adb tmtest.ads
-ada_tm25_SOURCES += ../../support/init.c
+ada_tm25_SOURCES += init.c
 
 ada_tm25$(EXEEXT): tm25.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm25/config.h b/testsuites/ada/tmtests/tm25/init.c
similarity index 95%
rename from testsuites/ada/tmtests/tm25/config.h
rename to testsuites/ada/tmtests/tm25/init.c
index 79b6724..ddbde34 100644
--- a/testsuites/ada/tmtests/tm25/config.h
+++ b/testsuites/ada/tmtests/tm25/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm28/Makefile.am b/testsuites/ada/tmtests/tm28/Makefile.am
index a18cc54..5f951d8 100644
--- a/testsuites/ada/tmtests/tm28/Makefile.am
+++ b/testsuites/ada/tmtests/tm28/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm28
 ada_tm28_SOURCES = tm28.adb config.h tmtest.adb tmtest.ads
-ada_tm28_SOURCES += ../../support/init.c
+ada_tm28_SOURCES += init.c
 
 ada_tm28$(EXEEXT): tm28.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm28/config.h b/testsuites/ada/tmtests/tm28/init.c
similarity index 95%
rename from testsuites/ada/tmtests/tm28/config.h
rename to testsuites/ada/tmtests/tm28/init.c
index aca1947..4451f86 100644
--- a/testsuites/ada/tmtests/tm28/config.h
+++ b/testsuites/ada/tmtests/tm28/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tm29/Makefile.am b/testsuites/ada/tmtests/tm29/Makefile.am
index 3b9c540..6f4377d 100644
--- a/testsuites/ada/tmtests/tm29/Makefile.am
+++ b/testsuites/ada/tmtests/tm29/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tm29
 ada_tm29_SOURCES = tm29.adb config.h tmtest.adb tmtest.ads
-ada_tm29_SOURCES += ../../support/init.c
+ada_tm29_SOURCES += init.c
 
 ada_tm29$(EXEEXT): tm29.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tm29/config.h b/testsuites/ada/tmtests/tm29/init.c
similarity index 95%
rename from testsuites/ada/tmtests/tm29/config.h
rename to testsuites/ada/tmtests/tm29/init.c
index fd99933..6789a32 100644
--- a/testsuites/ada/tmtests/tm29/config.h
+++ b/testsuites/ada/tmtests/tm29/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tmck/Makefile.am b/testsuites/ada/tmtests/tmck/Makefile.am
index 0c4ccd9..9a74923 100644
--- a/testsuites/ada/tmtests/tmck/Makefile.am
+++ b/testsuites/ada/tmtests/tmck/Makefile.am
@@ -5,7 +5,7 @@ include $(top_srcdir)/ada.am
 
 noinst_PROGRAMS = ada_tmck
 ada_tmck_SOURCES = tmck.adb config.h tmtest.adb tmtest.ads
-ada_tmck_SOURCES += ../../support/init.c
+ada_tmck_SOURCES += init.c
 
 ada_tmck$(EXEEXT): tmck.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tmck/config.h b/testsuites/ada/tmtests/tmck/init.c
similarity index 95%
rename from testsuites/ada/tmtests/tmck/config.h
rename to testsuites/ada/tmtests/tmck/init.c
index 40b5622..0bce9d4 100644
--- a/testsuites/ada/tmtests/tmck/config.h
+++ b/testsuites/ada/tmtests/tmck/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */
diff --git a/testsuites/ada/tmtests/tmoverhd/Makefile.am b/testsuites/ada/tmtests/tmoverhd/Makefile.am
index e12637f..75e9719 100644
--- a/testsuites/ada/tmtests/tmoverhd/Makefile.am
+++ b/testsuites/ada/tmtests/tmoverhd/Makefile.am
@@ -6,7 +6,7 @@ include $(top_srcdir)/ada.am
 noinst_PROGRAMS = ada_tmoverhd
 ada_tmoverhd_SOURCES = tmoverhd.adb config.h tmtest.adb tmtest.ads \
     dummy_rtems.adb dummy_rtems.ads
-ada_tmoverhd_SOURCES += ../../support/init.c
+ada_tmoverhd_SOURCES += init.c
 
 ada_tmoverhd$(EXEEXT): tmoverhd.adb init.$(OBJEXT)
 	$(GNATCOMPILE) -margs -a $< -o $@
diff --git a/testsuites/ada/tmtests/tmoverhd/config.h b/testsuites/ada/tmtests/tmoverhd/init.c
similarity index 95%
rename from testsuites/ada/tmtests/tmoverhd/config.h
rename to testsuites/ada/tmtests/tmoverhd/init.c
index df551c9..37b6c28 100644
--- a/testsuites/ada/tmtests/tmoverhd/config.h
+++ b/testsuites/ada/tmtests/tmoverhd/init.c
@@ -29,6 +29,6 @@
 #define CONFIGURE_MAXIMUM_POSIX_THREADS              10
 #define CONFIGURE_MAXIMUM_POSIX_KEYS                 10
 
-#include <rtems/confdefs.h>
+#include "../../support/initimpl.h"
 
 /* end of include file */

