stdio-common: Adjust header inclusion in scanf input specifier tests

Move the inclusion of the data class header from the individual tests to the data-type-specific skeleton, providing for the use of the data type under test in the data class header and reducing duplication. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
2025-10-24 13:33:08 +03:00 · 2025-08-23 01:02:10 +01:00
parent 2419637eb0
commit a1e5ee13ab
99 changed files with 18 additions and 86 deletions
--- a/stdio-common/tst-scanf-format-f-c.c
+++ b/stdio-common/tst-scanf-format-f-c.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-f.h"
-#include "tst-scanf-format-character.h"
 #include <tst-scanf-format-skeleton-c.c>
--- a/stdio-common/tst-scanf-format-f-char.c
+++ b/stdio-common/tst-scanf-format-f-char.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-f.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-char.c>
--- a/stdio-common/tst-scanf-format-f-double.c
+++ b/stdio-common/tst-scanf-format-f-double.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-f.h"
-#include "tst-scanf-format-real.h"
 #include <tst-scanf-format-skeleton-double.c>
--- a/stdio-common/tst-scanf-format-f-float.c
+++ b/stdio-common/tst-scanf-format-f-float.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-f.h"
-#include "tst-scanf-format-real.h"
 #include <tst-scanf-format-skeleton-float.c>
--- a/stdio-common/tst-scanf-format-f-int.c
+++ b/stdio-common/tst-scanf-format-f-int.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-f.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-int.c>
--- a/stdio-common/tst-scanf-format-f-ldouble.c
+++ b/stdio-common/tst-scanf-format-f-ldouble.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-f.h"
-#include "tst-scanf-format-real.h"
 #include <tst-scanf-format-skeleton-ldouble.c>
--- a/stdio-common/tst-scanf-format-f-llong.c
+++ b/stdio-common/tst-scanf-format-f-llong.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-f.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-llong.c>
--- a/stdio-common/tst-scanf-format-f-long.c
+++ b/stdio-common/tst-scanf-format-f-long.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-f.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-long.c>
--- a/stdio-common/tst-scanf-format-f-short.c
+++ b/stdio-common/tst-scanf-format-f-short.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-f.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-short.c>
--- a/stdio-common/tst-scanf-format-f-uchar.c
+++ b/stdio-common/tst-scanf-format-f-uchar.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-f.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-uchar.c>
--- a/stdio-common/tst-scanf-format-f-uint.c
+++ b/stdio-common/tst-scanf-format-f-uint.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-f.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-uint.c>
--- a/stdio-common/tst-scanf-format-f-ullong.c
+++ b/stdio-common/tst-scanf-format-f-ullong.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-f.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-ullong.c>
--- a/stdio-common/tst-scanf-format-f-ulong.c
+++ b/stdio-common/tst-scanf-format-f-ulong.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-f.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-ulong.c>
--- a/stdio-common/tst-scanf-format-f-ushort.c
+++ b/stdio-common/tst-scanf-format-f-ushort.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-f.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-ushort.c>
--- a/stdio-common/tst-scanf-format-s-c.c
+++ b/stdio-common/tst-scanf-format-s-c.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-s.h"
-#include "tst-scanf-format-character.h"
 #include <tst-scanf-format-skeleton-c.c>
--- a/stdio-common/tst-scanf-format-s-char.c
+++ b/stdio-common/tst-scanf-format-s-char.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-s.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-char.c>
--- a/stdio-common/tst-scanf-format-s-double.c
+++ b/stdio-common/tst-scanf-format-s-double.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-s.h"
-#include "tst-scanf-format-real.h"
 #include <tst-scanf-format-skeleton-double.c>
--- a/stdio-common/tst-scanf-format-s-float.c
+++ b/stdio-common/tst-scanf-format-s-float.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-s.h"
-#include "tst-scanf-format-real.h"
 #include <tst-scanf-format-skeleton-float.c>
--- a/stdio-common/tst-scanf-format-s-int.c
+++ b/stdio-common/tst-scanf-format-s-int.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-s.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-int.c>
--- a/stdio-common/tst-scanf-format-s-ldouble.c
+++ b/stdio-common/tst-scanf-format-s-ldouble.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-s.h"
-#include "tst-scanf-format-real.h"
 #include <tst-scanf-format-skeleton-ldouble.c>
--- a/stdio-common/tst-scanf-format-s-llong.c
+++ b/stdio-common/tst-scanf-format-s-llong.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-s.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-llong.c>
--- a/stdio-common/tst-scanf-format-s-long.c
+++ b/stdio-common/tst-scanf-format-s-long.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-s.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-long.c>
--- a/stdio-common/tst-scanf-format-s-short.c
+++ b/stdio-common/tst-scanf-format-s-short.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-s.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-short.c>
--- a/stdio-common/tst-scanf-format-s-uchar.c
+++ b/stdio-common/tst-scanf-format-s-uchar.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-s.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-uchar.c>
--- a/stdio-common/tst-scanf-format-s-uint.c
+++ b/stdio-common/tst-scanf-format-s-uint.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-s.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-uint.c>
--- a/stdio-common/tst-scanf-format-s-ullong.c
+++ b/stdio-common/tst-scanf-format-s-ullong.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-s.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-ullong.c>
--- a/stdio-common/tst-scanf-format-s-ulong.c
+++ b/stdio-common/tst-scanf-format-s-ulong.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-s.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-ulong.c>
--- a/stdio-common/tst-scanf-format-s-ushort.c
+++ b/stdio-common/tst-scanf-format-s-ushort.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-s.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-ushort.c>
--- a/stdio-common/tst-scanf-format-skeleton-c.c
+++ b/stdio-common/tst-scanf-format-skeleton-c.c
@@ -18,4 +18,5 @@

 typedef char *type_t;

+#include "tst-scanf-format-character.h"
 #include "tst-scanf-format-skeleton.c"
--- a/stdio-common/tst-scanf-format-skeleton-char.c
+++ b/stdio-common/tst-scanf-format-skeleton-char.c
@@ -18,4 +18,5 @@

 typedef signed char type_t;

+#include "tst-scanf-format-integer.h"
 #include "tst-scanf-format-skeleton.c"
--- a/stdio-common/tst-scanf-format-skeleton-double.c
+++ b/stdio-common/tst-scanf-format-skeleton-double.c
@@ -18,4 +18,5 @@

 typedef double type_t;

+#include "tst-scanf-format-real.h"
 #include "tst-scanf-format-skeleton.c"
--- a/stdio-common/tst-scanf-format-skeleton-float.c
+++ b/stdio-common/tst-scanf-format-skeleton-float.c
@@ -18,4 +18,5 @@

 typedef float type_t;

+#include "tst-scanf-format-real.h"
 #include "tst-scanf-format-skeleton.c"
--- a/stdio-common/tst-scanf-format-skeleton-int.c
+++ b/stdio-common/tst-scanf-format-skeleton-int.c
@@ -18,4 +18,5 @@

 typedef int type_t;

+#include "tst-scanf-format-integer.h"
 #include "tst-scanf-format-skeleton.c"
--- a/stdio-common/tst-scanf-format-skeleton-ldouble.c
+++ b/stdio-common/tst-scanf-format-skeleton-ldouble.c
@@ -18,4 +18,5 @@

 typedef long double type_t;

+#include "tst-scanf-format-real.h"
 #include "tst-scanf-format-skeleton.c"
--- a/stdio-common/tst-scanf-format-skeleton-llong.c
+++ b/stdio-common/tst-scanf-format-skeleton-llong.c
@@ -18,4 +18,5 @@

 typedef long long int type_t;

+#include "tst-scanf-format-integer.h"
 #include "tst-scanf-format-skeleton.c"
--- a/stdio-common/tst-scanf-format-skeleton-long.c
+++ b/stdio-common/tst-scanf-format-skeleton-long.c
@@ -18,4 +18,5 @@

 typedef long int type_t;

+#include "tst-scanf-format-integer.h"
 #include "tst-scanf-format-skeleton.c"
--- a/stdio-common/tst-scanf-format-skeleton-short.c
+++ b/stdio-common/tst-scanf-format-skeleton-short.c
@@ -18,4 +18,5 @@

 typedef short int type_t;

+#include "tst-scanf-format-integer.h"
 #include "tst-scanf-format-skeleton.c"
--- a/stdio-common/tst-scanf-format-skeleton-uchar.c
+++ b/stdio-common/tst-scanf-format-skeleton-uchar.c
@@ -19,4 +19,5 @@
 #define TYPE_T_UNSIGNED_P 1
 typedef unsigned char type_t;

+#include "tst-scanf-format-integer.h"
 #include "tst-scanf-format-skeleton.c"
--- a/stdio-common/tst-scanf-format-skeleton-uint.c
+++ b/stdio-common/tst-scanf-format-skeleton-uint.c
@@ -19,4 +19,5 @@
 #define TYPE_T_UNSIGNED_P 1
 typedef unsigned int type_t;

+#include "tst-scanf-format-integer.h"
 #include "tst-scanf-format-skeleton.c"
--- a/stdio-common/tst-scanf-format-skeleton-ullong.c
+++ b/stdio-common/tst-scanf-format-skeleton-ullong.c
@@ -19,4 +19,5 @@
 #define TYPE_T_UNSIGNED_P 1
 typedef unsigned long long int type_t;

+#include "tst-scanf-format-integer.h"
 #include "tst-scanf-format-skeleton.c"
--- a/stdio-common/tst-scanf-format-skeleton-ulong.c
+++ b/stdio-common/tst-scanf-format-skeleton-ulong.c
@@ -19,4 +19,5 @@
 #define TYPE_T_UNSIGNED_P 1
 typedef unsigned long int type_t;

+#include "tst-scanf-format-integer.h"
 #include "tst-scanf-format-skeleton.c"
--- a/stdio-common/tst-scanf-format-skeleton-ushort.c
+++ b/stdio-common/tst-scanf-format-skeleton-ushort.c
@@ -19,4 +19,5 @@
 #define TYPE_T_UNSIGNED_P 1
 typedef unsigned short int type_t;

+#include "tst-scanf-format-integer.h"
 #include "tst-scanf-format-skeleton.c"
--- a/stdio-common/tst-scanf-format-ss-c.c
+++ b/stdio-common/tst-scanf-format-ss-c.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-ss.h"
-#include "tst-scanf-format-character.h"
 #include <tst-scanf-format-skeleton-c.c>
--- a/stdio-common/tst-scanf-format-ss-char.c
+++ b/stdio-common/tst-scanf-format-ss-char.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-ss.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-char.c>
--- a/stdio-common/tst-scanf-format-ss-double.c
+++ b/stdio-common/tst-scanf-format-ss-double.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-ss.h"
-#include "tst-scanf-format-real.h"
 #include <tst-scanf-format-skeleton-double.c>
--- a/stdio-common/tst-scanf-format-ss-float.c
+++ b/stdio-common/tst-scanf-format-ss-float.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-ss.h"
-#include "tst-scanf-format-real.h"
 #include <tst-scanf-format-skeleton-float.c>
--- a/stdio-common/tst-scanf-format-ss-int.c
+++ b/stdio-common/tst-scanf-format-ss-int.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-ss.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-int.c>
--- a/stdio-common/tst-scanf-format-ss-ldouble.c
+++ b/stdio-common/tst-scanf-format-ss-ldouble.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-ss.h"
-#include "tst-scanf-format-real.h"
 #include <tst-scanf-format-skeleton-ldouble.c>
--- a/stdio-common/tst-scanf-format-ss-llong.c
+++ b/stdio-common/tst-scanf-format-ss-llong.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-ss.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-llong.c>
--- a/stdio-common/tst-scanf-format-ss-long.c
+++ b/stdio-common/tst-scanf-format-ss-long.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-ss.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-long.c>
--- a/stdio-common/tst-scanf-format-ss-short.c
+++ b/stdio-common/tst-scanf-format-ss-short.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-ss.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-short.c>
--- a/stdio-common/tst-scanf-format-ss-uchar.c
+++ b/stdio-common/tst-scanf-format-ss-uchar.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-ss.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-uchar.c>
--- a/stdio-common/tst-scanf-format-ss-uint.c
+++ b/stdio-common/tst-scanf-format-ss-uint.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-ss.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-uint.c>
--- a/stdio-common/tst-scanf-format-ss-ullong.c
+++ b/stdio-common/tst-scanf-format-ss-ullong.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-ss.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-ullong.c>
--- a/stdio-common/tst-scanf-format-ss-ulong.c
+++ b/stdio-common/tst-scanf-format-ss-ulong.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-ss.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-ulong.c>
--- a/stdio-common/tst-scanf-format-ss-ushort.c
+++ b/stdio-common/tst-scanf-format-ss-ushort.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-ss.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-ushort.c>
--- a/stdio-common/tst-scanf-format-v-c.c
+++ b/stdio-common/tst-scanf-format-v-c.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-v.h"
-#include "tst-scanf-format-character.h"
 #include <tst-scanf-format-skeleton-c.c>
--- a/stdio-common/tst-scanf-format-v-char.c
+++ b/stdio-common/tst-scanf-format-v-char.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-v.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-char.c>
--- a/stdio-common/tst-scanf-format-v-double.c
+++ b/stdio-common/tst-scanf-format-v-double.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-v.h"
-#include "tst-scanf-format-real.h"
 #include <tst-scanf-format-skeleton-double.c>
--- a/stdio-common/tst-scanf-format-v-float.c
+++ b/stdio-common/tst-scanf-format-v-float.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-v.h"
-#include "tst-scanf-format-real.h"
 #include <tst-scanf-format-skeleton-float.c>
--- a/stdio-common/tst-scanf-format-v-int.c
+++ b/stdio-common/tst-scanf-format-v-int.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-v.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-int.c>
--- a/stdio-common/tst-scanf-format-v-ldouble.c
+++ b/stdio-common/tst-scanf-format-v-ldouble.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-v.h"
-#include "tst-scanf-format-real.h"
 #include <tst-scanf-format-skeleton-ldouble.c>
--- a/stdio-common/tst-scanf-format-v-llong.c
+++ b/stdio-common/tst-scanf-format-v-llong.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-v.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-llong.c>
--- a/stdio-common/tst-scanf-format-v-long.c
+++ b/stdio-common/tst-scanf-format-v-long.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-v.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-long.c>
--- a/stdio-common/tst-scanf-format-v-short.c
+++ b/stdio-common/tst-scanf-format-v-short.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-v.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-short.c>
--- a/stdio-common/tst-scanf-format-v-uchar.c
+++ b/stdio-common/tst-scanf-format-v-uchar.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-v.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-uchar.c>
--- a/stdio-common/tst-scanf-format-v-uint.c
+++ b/stdio-common/tst-scanf-format-v-uint.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-v.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-uint.c>
--- a/stdio-common/tst-scanf-format-v-ullong.c
+++ b/stdio-common/tst-scanf-format-v-ullong.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-v.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-ullong.c>
--- a/stdio-common/tst-scanf-format-v-ulong.c
+++ b/stdio-common/tst-scanf-format-v-ulong.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-v.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-ulong.c>
--- a/stdio-common/tst-scanf-format-v-ushort.c
+++ b/stdio-common/tst-scanf-format-v-ushort.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-v.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-ushort.c>
--- a/stdio-common/tst-scanf-format-vf-c.c
+++ b/stdio-common/tst-scanf-format-vf-c.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vf.h"
-#include "tst-scanf-format-character.h"
 #include <tst-scanf-format-skeleton-c.c>
--- a/stdio-common/tst-scanf-format-vf-char.c
+++ b/stdio-common/tst-scanf-format-vf-char.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vf.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-char.c>
--- a/stdio-common/tst-scanf-format-vf-double.c
+++ b/stdio-common/tst-scanf-format-vf-double.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vf.h"
-#include "tst-scanf-format-real.h"
 #include <tst-scanf-format-skeleton-double.c>
--- a/stdio-common/tst-scanf-format-vf-float.c
+++ b/stdio-common/tst-scanf-format-vf-float.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vf.h"
-#include "tst-scanf-format-real.h"
 #include <tst-scanf-format-skeleton-float.c>
--- a/stdio-common/tst-scanf-format-vf-int.c
+++ b/stdio-common/tst-scanf-format-vf-int.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vf.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-int.c>
--- a/stdio-common/tst-scanf-format-vf-ldouble.c
+++ b/stdio-common/tst-scanf-format-vf-ldouble.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vf.h"
-#include "tst-scanf-format-real.h"
 #include <tst-scanf-format-skeleton-ldouble.c>
--- a/stdio-common/tst-scanf-format-vf-llong.c
+++ b/stdio-common/tst-scanf-format-vf-llong.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vf.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-llong.c>
--- a/stdio-common/tst-scanf-format-vf-long.c
+++ b/stdio-common/tst-scanf-format-vf-long.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vf.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-long.c>
--- a/stdio-common/tst-scanf-format-vf-short.c
+++ b/stdio-common/tst-scanf-format-vf-short.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vf.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-short.c>
--- a/stdio-common/tst-scanf-format-vf-uchar.c
+++ b/stdio-common/tst-scanf-format-vf-uchar.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vf.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-uchar.c>
--- a/stdio-common/tst-scanf-format-vf-uint.c
+++ b/stdio-common/tst-scanf-format-vf-uint.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vf.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-uint.c>
--- a/stdio-common/tst-scanf-format-vf-ullong.c
+++ b/stdio-common/tst-scanf-format-vf-ullong.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vf.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-ullong.c>
--- a/stdio-common/tst-scanf-format-vf-ulong.c
+++ b/stdio-common/tst-scanf-format-vf-ulong.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vf.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-ulong.c>
--- a/stdio-common/tst-scanf-format-vf-ushort.c
+++ b/stdio-common/tst-scanf-format-vf-ushort.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vf.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-ushort.c>
--- a/stdio-common/tst-scanf-format-vs-c.c
+++ b/stdio-common/tst-scanf-format-vs-c.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vs.h"
-#include "tst-scanf-format-character.h"
 #include <tst-scanf-format-skeleton-c.c>
--- a/stdio-common/tst-scanf-format-vs-char.c
+++ b/stdio-common/tst-scanf-format-vs-char.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vs.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-char.c>
--- a/stdio-common/tst-scanf-format-vs-double.c
+++ b/stdio-common/tst-scanf-format-vs-double.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vs.h"
-#include "tst-scanf-format-real.h"
 #include <tst-scanf-format-skeleton-double.c>
--- a/stdio-common/tst-scanf-format-vs-float.c
+++ b/stdio-common/tst-scanf-format-vs-float.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vs.h"
-#include "tst-scanf-format-real.h"
 #include <tst-scanf-format-skeleton-float.c>
--- a/stdio-common/tst-scanf-format-vs-int.c
+++ b/stdio-common/tst-scanf-format-vs-int.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vs.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-int.c>
--- a/stdio-common/tst-scanf-format-vs-ldouble.c
+++ b/stdio-common/tst-scanf-format-vs-ldouble.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vs.h"
-#include "tst-scanf-format-real.h"
 #include <tst-scanf-format-skeleton-ldouble.c>
--- a/stdio-common/tst-scanf-format-vs-llong.c
+++ b/stdio-common/tst-scanf-format-vs-llong.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vs.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-llong.c>
--- a/stdio-common/tst-scanf-format-vs-long.c
+++ b/stdio-common/tst-scanf-format-vs-long.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vs.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-long.c>
--- a/stdio-common/tst-scanf-format-vs-short.c
+++ b/stdio-common/tst-scanf-format-vs-short.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vs.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-short.c>
--- a/stdio-common/tst-scanf-format-vs-uchar.c
+++ b/stdio-common/tst-scanf-format-vs-uchar.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vs.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-uchar.c>
--- a/stdio-common/tst-scanf-format-vs-uint.c
+++ b/stdio-common/tst-scanf-format-vs-uint.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vs.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-uint.c>
--- a/stdio-common/tst-scanf-format-vs-ullong.c
+++ b/stdio-common/tst-scanf-format-vs-ullong.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vs.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-ullong.c>
--- a/stdio-common/tst-scanf-format-vs-ulong.c
+++ b/stdio-common/tst-scanf-format-vs-ulong.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vs.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-ulong.c>
--- a/stdio-common/tst-scanf-format-vs-ushort.c
+++ b/stdio-common/tst-scanf-format-vs-ushort.c
@@ -18,5 +18,4 @@

 #include "tst-scanf-format-skeleton.h"
 #include "tst-scanf-format-vs.h"
-#include "tst-scanf-format-integer.h"
 #include <tst-scanf-format-skeleton-ushort.c>
--- a/sysdeps/ieee754/ldbl-96/tst-scanf-format-skeleton-ldouble.c
+++ b/sysdeps/ieee754/ldbl-96/tst-scanf-format-skeleton-ldouble.c
@@ -20,6 +20,10 @@
 #include <stdint.h>
 #include <string.h>

+typedef long double type_t;
+
+#include "tst-scanf-format-real.h"
+
 #undef compare_real
 #define compare_real(x, y)						\
 ({									\
@@ -28,6 +32,4 @@
   && ux.parts.sign_exponent == uy.parts.sign_exponent);	 	\
 })

-typedef long double type_t;
-
 #include "tst-scanf-format-skeleton.c"