tests: Add header for RTEMS test printer

The <rtems/test-info.h> header file is required for every RTEMS test
program.  Move the RTEMS test printer support to a dedicated header file
<rtems/test-printer.h>.  This removes an unnecessary dependency to the
RTEMS printer support in <rtems/test-info.h>.

Tests using the RTEMS Testing Framework no longer depend on the
<rtems/printer.h>.

38 files changed, 105 insertions, 48 deletions

diff --git a/cpukit/include/rtems/test-info.h b/cpukit/include/rtems/test-info.h
index c1b41ccc6e..a5c00c423a 100644
--- a/cpukit/include/rtems/test-info.h
+++ b/cpukit/include/rtems/test-info.h
@@ -3,10 +3,9 @@
 /**
  * @file
  *
- * @ingroup RTEMSTestFramework
+ * @ingroup RTEMSTest
  *
- * @brief This header file provides interfaces of the
- *   RTEMS Test Framework.
+ * @brief This header file provides interfaces of the RTEMS Test Support.
  */
 
 /*
@@ -38,7 +37,6 @@
 #define _RTEMS_TEST_H
 
 #include <rtems.h>
-#include <rtems/printer.h>
 #include <rtems/score/atomic.h>
 #include <rtems/score/smpbarrier.h>
 
@@ -62,11 +60,6 @@ extern "C" {
 extern const char rtems_test_name[];
 
 /**
- * @brief Each test must define a printer.
- */
-extern rtems_printer rtems_test_printer;
-
-/**
  * @brief Fatal extension for tests.
  */
 void rtems_test_fatal_extension(
@@ -134,13 +127,6 @@ int rtems_test_end(const char* name);
  */
 RTEMS_NO_RETURN void rtems_test_exit(int status);
 
-/**
- * @brief Prints via the RTEMS printer.
- *
- * @return As specified by printf().
- */
-int rtems_test_printf(const char* format, ...) RTEMS_PRINTFLIKE(1, 2);
-
 #define RTEMS_TEST_PARALLEL_PROCESSOR_MAX 32
 
 typedef struct rtems_test_parallel_job rtems_test_parallel_job;
diff --git a/cpukit/include/rtems/test-printer.h b/cpukit/include/rtems/test-printer.h
new file mode 100644
index 0000000000..6625aa5a29
--- /dev/null
+++ b/cpukit/include/rtems/test-printer.h
@@ -0,0 +1,69 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
+/**
+ * @file
+ *
+ * @ingroup RTEMSTest
+ *
+ * @brief This header file provides interfaces of the RTEMS Test Support.
+ */
+
+/*
+ * Copyright (C) 2014, 2023 embedded brains GmbH & Co. KG
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _RTEMS_TEST_PRINTER_H
+#define _RTEMS_TEST_PRINTER_H
+
+#include <rtems/printer.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/**
+ * @addtogroup RTEMSTest
+ *
+ * @{
+ */
+
+/**
+ * @brief Provides an RTEMS printer for tests.
+ */
+extern rtems_printer rtems_test_printer;
+
+/**
+ * @brief Prints via the RTEMS test printer.
+ *
+ * @return Returns the count of output characters as specified by printf().
+ */
+int rtems_test_printf( const char *format, ... ) RTEMS_PRINTFLIKE( 1, 2 );
+
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* _RTEMS_TEST_PRINTER_H */
diff --git a/cpukit/libtest/testbeginend.c b/cpukit/libtest/testbeginend.c
index 546fdf65ff..eca8712b35 100644
--- a/cpukit/libtest/testbeginend.c
+++ b/cpukit/libtest/testbeginend.c
@@ -41,6 +41,7 @@
 #endif
 
 #include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 #include <rtems/bspIo.h>
 #include <rtems/version.h>
 
diff --git a/cpukit/libtest/testwrappers.c b/cpukit/libtest/testwrappers.c
index 3c6e8fccc3..2316208f7c 100644
--- a/cpukit/libtest/testwrappers.c
+++ b/cpukit/libtest/testwrappers.c
@@ -29,7 +29,7 @@
 #include "config.h"
 #endif
 
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 int __wrap_printf(const char* format, ...);
 int __wrap_puts(const char *str);
diff --git a/spec/build/cpukit/librtemstest.yml b/spec/build/cpukit/librtemstest.yml
index 19b1066b27..fc268f8971 100644
--- a/spec/build/cpukit/librtemstest.yml
+++ b/spec/build/cpukit/librtemstest.yml
@@ -13,6 +13,7 @@ install:
   - cpukit/include/rtems/test.h
   - cpukit/include/rtems/test-info.h
   - cpukit/include/rtems/test-gcov.h
+  - cpukit/include/rtems/test-printer.h
   - cpukit/include/rtems/test-scheduler.h
 install-path: ${BSP_LIBDIR}
 links: []
diff --git a/testsuites/benchmarks/linpack/linpack-pc.c b/testsuites/benchmarks/linpack/linpack-pc.c
index 1fef18eb96..5f00df1d7c 100644
--- a/testsuites/benchmarks/linpack/linpack-pc.c
+++ b/testsuites/benchmarks/linpack/linpack-pc.c
@@ -224,7 +224,7 @@
 #include <math.h>
 #include <stdlib.h>
 #ifdef __rtems__
-#include <tmacros.h>
+#include <rtems/test-printer.h>
 #undef print_time
 #define fprintf(f, ...) rtems_printf(&rtems_test_printer, __VA_ARGS__)
 #endif /* __rtems__ */
diff --git a/testsuites/benchmarks/whetstone/whetstone.c b/testsuites/benchmarks/whetstone/whetstone.c
index e0a93aa88c..aae68af6a6 100644
--- a/testsuites/benchmarks/whetstone/whetstone.c
+++ b/testsuites/benchmarks/whetstone/whetstone.c
@@ -57,7 +57,7 @@ C**********************************************************************
 #include <string.h>
 #include <math.h>
 #ifdef __rtems__
-#include <tmacros.h>
+#include <rtems/test-printer.h>
 #define fprintf(f, ...) rtems_printf(&rtems_test_printer, __VA_ARGS__)
 #endif /* __rtems__ */
 
diff --git a/testsuites/fstests/tftpfs/init.c b/testsuites/fstests/tftpfs/init.c
index 4a8a4f3c35..74d1d5d311 100644
--- a/testsuites/fstests/tftpfs/init.c
+++ b/testsuites/fstests/tftpfs/init.c
@@ -42,6 +42,7 @@
 #include "config.h"
 #endif
 
+#include <stdio.h>
 #include <stdlib.h> /* malloc(), free() */
 #include <ctype.h> /* isprint() */
 #include <errno.h>
diff --git a/testsuites/libtests/dl01/dl01-o1.c b/testsuites/libtests/dl01/dl01-o1.c
index ade4d5744d..9350235d85 100644
--- a/testsuites/libtests/dl01/dl01-o1.c
+++ b/testsuites/libtests/dl01/dl01-o1.c
@@ -29,7 +29,7 @@
  * Hello World as a loadable module.
  */
 
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl02/dl02-o1.c b/testsuites/libtests/dl02/dl02-o1.c
index b442f82ae7..3b3e51825d 100644
--- a/testsuites/libtests/dl02/dl02-o1.c
+++ b/testsuites/libtests/dl02/dl02-o1.c
@@ -29,7 +29,7 @@
 
 #include <dlfcn.h>
 
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl02/dl02-o2.c b/testsuites/libtests/dl02/dl02-o2.c
index 02a537a84f..6694c5e985 100644
--- a/testsuites/libtests/dl02/dl02-o2.c
+++ b/testsuites/libtests/dl02/dl02-o2.c
@@ -27,7 +27,7 @@
 
 #include "dl-o2.h"
 
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__)
 
diff --git a/testsuites/libtests/dl05/dl05-o5.cc b/testsuites/libtests/dl05/dl05-o5.cc
index c861916ff0..f928cf9004 100644
--- a/testsuites/libtests/dl05/dl05-o5.cc
+++ b/testsuites/libtests/dl05/dl05-o5.cc
@@ -2,7 +2,7 @@
 
 #include <stdexcept>
 
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl06/dl06-o1.c b/testsuites/libtests/dl06/dl06-o1.c
index 719d01e91f..1b8482bc3e 100644
--- a/testsuites/libtests/dl06/dl06-o1.c
+++ b/testsuites/libtests/dl06/dl06-o1.c
@@ -30,7 +30,7 @@
 #include <dlfcn.h>
 #include <math.h>
 
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl06/dl06-o2.c b/testsuites/libtests/dl06/dl06-o2.c
index 837c2e8e4f..0a46c027a8 100644
--- a/testsuites/libtests/dl06/dl06-o2.c
+++ b/testsuites/libtests/dl06/dl06-o2.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl07/dl07-o1.c b/testsuites/libtests/dl07/dl07-o1.c
index 24a8086c49..0bca0ab838 100644
--- a/testsuites/libtests/dl07/dl07-o1.c
+++ b/testsuites/libtests/dl07/dl07-o1.c
@@ -28,7 +28,7 @@
 
 #include "dl-o1.h"
 
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 #include "dl-load.h"
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
diff --git a/testsuites/libtests/dl07/dl07-o2.c b/testsuites/libtests/dl07/dl07-o2.c
index 12cc917ae0..46aef0d6fe 100644
--- a/testsuites/libtests/dl07/dl07-o2.c
+++ b/testsuites/libtests/dl07/dl07-o2.c
@@ -29,7 +29,7 @@
 #include "dl-o1.h"
 #include "dl-o2.h"
 
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl07/dl07-o3.c b/testsuites/libtests/dl07/dl07-o3.c
index 12a5fe6829..ab60f50e97 100644
--- a/testsuites/libtests/dl07/dl07-o3.c
+++ b/testsuites/libtests/dl07/dl07-o3.c
@@ -32,7 +32,7 @@
 #include "dl-o5.h"
 
 #include <inttypes.h>
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl07/dl07-o4.c b/testsuites/libtests/dl07/dl07-o4.c
index aeeb404561..e5f831ec24 100644
--- a/testsuites/libtests/dl07/dl07-o4.c
+++ b/testsuites/libtests/dl07/dl07-o4.c
@@ -29,7 +29,7 @@
 #include "dl-o1.h"
 #include "dl-o4.h"
 
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl07/dl07-o5.c b/testsuites/libtests/dl07/dl07-o5.c
index e487d072ae..83e98f6d9d 100644
--- a/testsuites/libtests/dl07/dl07-o5.c
+++ b/testsuites/libtests/dl07/dl07-o5.c
@@ -30,7 +30,7 @@
 #include "dl-o5.h"
 
 #include <inttypes.h>
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl08/dl08-o1.c b/testsuites/libtests/dl08/dl08-o1.c
index ccd8bc3587..015e847ea2 100644
--- a/testsuites/libtests/dl08/dl08-o1.c
+++ b/testsuites/libtests/dl08/dl08-o1.c
@@ -28,7 +28,7 @@
 
 #include "dl-o1.h"
 
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 #include "dl-load.h"
 #include "dl-o1.h"
 #include "dl-o2.h"
diff --git a/testsuites/libtests/dl08/dl08-o2.c b/testsuites/libtests/dl08/dl08-o2.c
index 8d72cb8703..3833cb5768 100644
--- a/testsuites/libtests/dl08/dl08-o2.c
+++ b/testsuites/libtests/dl08/dl08-o2.c
@@ -29,7 +29,7 @@
 #include "dl-o2.h"
 #include "dl-o3.h"
 
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl08/dl08-o3.c b/testsuites/libtests/dl08/dl08-o3.c
index 267895476c..dc839bf270 100644
--- a/testsuites/libtests/dl08/dl08-o3.c
+++ b/testsuites/libtests/dl08/dl08-o3.c
@@ -31,7 +31,7 @@
 #include "dl-o5.h"
 
 #include <inttypes.h>
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl08/dl08-o4.c b/testsuites/libtests/dl08/dl08-o4.c
index b77bf60465..d09fd2ec93 100644
--- a/testsuites/libtests/dl08/dl08-o4.c
+++ b/testsuites/libtests/dl08/dl08-o4.c
@@ -29,7 +29,7 @@
 #include "dl-o4.h"
 #include "dl-o5.h"
 
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl08/dl08-o5.c b/testsuites/libtests/dl08/dl08-o5.c
index 614bff6a24..de86437757 100644
--- a/testsuites/libtests/dl08/dl08-o5.c
+++ b/testsuites/libtests/dl08/dl08-o5.c
@@ -30,7 +30,7 @@
 #include "dl-o6.h"
 
 #include <inttypes.h>
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl08/dl08-o6-123456789-123456789.c b/testsuites/libtests/dl08/dl08-o6-123456789-123456789.c
index 3a03ec6e84..47d3f66f76 100644
--- a/testsuites/libtests/dl08/dl08-o6-123456789-123456789.c
+++ b/testsuites/libtests/dl08/dl08-o6-123456789-123456789.c
@@ -29,7 +29,7 @@
 #include "dl-o6.h"
 
 #include <inttypes.h>
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl09/dl09-o1.c b/testsuites/libtests/dl09/dl09-o1.c
index 4659fda17c..291d33fcd0 100644
--- a/testsuites/libtests/dl09/dl09-o1.c
+++ b/testsuites/libtests/dl09/dl09-o1.c
@@ -28,7 +28,7 @@
 
 #include "dl-o1.h"
 
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 #include "dl-load.h"
 #include "dl-o1.h"
 #include "dl-o2.h"
diff --git a/testsuites/libtests/dl09/dl09-o2.c b/testsuites/libtests/dl09/dl09-o2.c
index a6906b4ad9..e8976f3b49 100644
--- a/testsuites/libtests/dl09/dl09-o2.c
+++ b/testsuites/libtests/dl09/dl09-o2.c
@@ -29,7 +29,7 @@
 #include "dl-o2.h"
 #include "dl-o3.h"
 
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl09/dl09-o3.c b/testsuites/libtests/dl09/dl09-o3.c
index fab70c02c7..d9a056d45d 100644
--- a/testsuites/libtests/dl09/dl09-o3.c
+++ b/testsuites/libtests/dl09/dl09-o3.c
@@ -31,7 +31,7 @@
 #include "dl-o5.h"
 
 #include <inttypes.h>
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl09/dl09-o4.c b/testsuites/libtests/dl09/dl09-o4.c
index 5cf4eb0f4b..8998059c93 100644
--- a/testsuites/libtests/dl09/dl09-o4.c
+++ b/testsuites/libtests/dl09/dl09-o4.c
@@ -29,7 +29,7 @@
 #include "dl-o4.h"
 #include "dl-o5.h"
 
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl09/dl09-o5.c b/testsuites/libtests/dl09/dl09-o5.c
index 6b4aedbf68..e5374f3eb8 100644
--- a/testsuites/libtests/dl09/dl09-o5.c
+++ b/testsuites/libtests/dl09/dl09-o5.c
@@ -30,7 +30,7 @@
 #include "dl-o5.h"
 
 #include <inttypes.h>
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl10/dl10-o1.c b/testsuites/libtests/dl10/dl10-o1.c
index ccd8bc3587..015e847ea2 100644
--- a/testsuites/libtests/dl10/dl10-o1.c
+++ b/testsuites/libtests/dl10/dl10-o1.c
@@ -28,7 +28,7 @@
 
 #include "dl-o1.h"
 
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 #include "dl-load.h"
 #include "dl-o1.h"
 #include "dl-o2.h"
diff --git a/testsuites/libtests/dl10/dl10-o2.c b/testsuites/libtests/dl10/dl10-o2.c
index 8d72cb8703..3833cb5768 100644
--- a/testsuites/libtests/dl10/dl10-o2.c
+++ b/testsuites/libtests/dl10/dl10-o2.c
@@ -29,7 +29,7 @@
 #include "dl-o2.h"
 #include "dl-o3.h"
 
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl10/dl10-o3.c b/testsuites/libtests/dl10/dl10-o3.c
index 267895476c..dc839bf270 100644
--- a/testsuites/libtests/dl10/dl10-o3.c
+++ b/testsuites/libtests/dl10/dl10-o3.c
@@ -31,7 +31,7 @@
 #include "dl-o5.h"
 
 #include <inttypes.h>
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl10/dl10-o4.c b/testsuites/libtests/dl10/dl10-o4.c
index b77bf60465..d09fd2ec93 100644
--- a/testsuites/libtests/dl10/dl10-o4.c
+++ b/testsuites/libtests/dl10/dl10-o4.c
@@ -29,7 +29,7 @@
 #include "dl-o4.h"
 #include "dl-o5.h"
 
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl10/dl10-o5.c b/testsuites/libtests/dl10/dl10-o5.c
index 35cfbda2cd..185c259d8c 100644
--- a/testsuites/libtests/dl10/dl10-o5.c
+++ b/testsuites/libtests/dl10/dl10-o5.c
@@ -29,7 +29,7 @@
 #include "dl-o5.h"
 
 #include <inttypes.h>
-#include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 
 #define printf(...) rtems_printf(&rtems_test_printer, __VA_ARGS__);
 
diff --git a/testsuites/libtests/dl10/dl10-o6.c b/testsuites/libtests/dl10/dl10-o6.c
index fad9516f7b..2484ff6f2f 100644
--- a/testsuites/libtests/dl10/dl10-o6.c
+++ b/testsuites/libtests/dl10/dl10-o6.c
@@ -29,7 +29,6 @@
 #include "dl-o5.h"
 
 #include <inttypes.h>
-#include <rtems/test-info.h>
 
 int rtems_main_o5 (void)
 {
diff --git a/testsuites/libtests/dl11/dl11-o1.c b/testsuites/libtests/dl11/dl11-o1.c
index 21aa9bfc43..93ee2a60c7 100644
--- a/testsuites/libtests/dl11/dl11-o1.c
+++ b/testsuites/libtests/dl11/dl11-o1.c
@@ -25,7 +25,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <rtems/test-info.h>
 #include <errno.h>
 
 int get_errno_val (void);
diff --git a/testsuites/support/include/tmacros.h b/testsuites/support/include/tmacros.h
index 0dc35ea21d..aa20411623 100644
--- a/testsuites/support/include/tmacros.h
+++ b/testsuites/support/include/tmacros.h
@@ -46,6 +46,7 @@
 #include <string.h>
 #include <rtems/error.h>
 #include <rtems/test-info.h>
+#include <rtems/test-printer.h>
 #include <rtems/score/threaddispatch.h>
 
 #include <buffer_test_io.h>