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.

48 files changed, 48 insertions, 48 deletions

diff --git a/testsuites/ada/sptests/sp01/Makefile.am b/testsuites/ada/sptests/sp01/Makefile.am
index 62b1e6f08b..baa2d66676 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
index ee9e0fbde5..dc5f4fc87c 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 2c82e1ea1e..74bfd0f6b1 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
index 60f58c1c13..51801f6c65 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 6e6a502bba..e7656e9757 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
index 0c7507a3c5..6da581ed00 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 a9e6f4c207..d1c07e8089 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
index 8fccddb09a..c55a103b9a 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 8ace676457..4330da6f53 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
index d5ddc1d724..048edae1e8 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 0cc703a483..7ca252d542 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
index 492e0e68be..b37a6a4084 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 8ce5e22c1b..321017c942 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
index ffdac2d224..c47213ef68 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 5c9d5d8fdc..4380e7bb33 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
index af9175713c..328e3eef78 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 c625d702a5..e24f969386 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
index 4d96170ea0..534dccd25a 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 e900713344..0c80d393df 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
index 508613e314..edd86bc77e 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 fce1a0e6b3..0fcb25ff6e 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
index 8edb8baf90..4dc8aad2b4 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 01a6021b49..7ca7fb64c0 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
index 2d6dd34f1f..13f9fc2c0f 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 2b6c12a726..5874c26e85 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
index 2a53074581..076e3d9763 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 9462600225..9e1b6b8317 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
index b0d535c347..6b1b1f323b 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 82576fc045..b0bb223352 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
index c50733678e..c0a75da20e 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 8357d1c47b..142cbd3b41 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
index 9813e25d25..7dfd620d77 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 8a38c8cf8c..27604b136e 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
index 1cdc8a05d2..2d0d5b39f2 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 7b22ec860e..a298575ebf 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
index 55990e2218..7146c3f3da 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 dfdce80bb7..94407e1bde 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
index da60e49360..6ebc1b99c3 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 64c7746415..3a19f5736b 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
index 5af9f6244d..76e5f7b883 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 7d9cbc857b..21704688a3 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
index ee18ff3fac..3989b42113 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 7cef185b92..b603e4350f 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
index d7c6c19cb5..8004204cfd 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 b27c692cd8..1edd8989ce 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
index dad989dbe4..38c5fc519a 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 b3cf5067b3..56d64a794e 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
index 8316f41e0c..334b6ca2f6 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 */