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>

99 files changed, 18 insertions, 86 deletions

diff --git a/stdio-common/tst-scanf-format-f-c.c b/stdio-common/tst-scanf-format-f-c.c
index 144221a..143f94a 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-f-char.c b/stdio-common/tst-scanf-format-f-char.c
index efa7c1a..ba70d6e 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-f-double.c b/stdio-common/tst-scanf-format-f-double.c
index 668a975..45e6fee 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-f-float.c b/stdio-common/tst-scanf-format-f-float.c
index 07d65ef..fcf6132 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-f-int.c b/stdio-common/tst-scanf-format-f-int.c
index 4b1a5f0..cec4352 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-f-ldouble.c b/stdio-common/tst-scanf-format-f-ldouble.c
index 2aacd9d..0128597 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-f-llong.c b/stdio-common/tst-scanf-format-f-llong.c
index 45d0f8b..63ff399 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-f-long.c b/stdio-common/tst-scanf-format-f-long.c
index bcb2e23..fa08ef2 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-f-short.c b/stdio-common/tst-scanf-format-f-short.c
index e384f3d..c901fbc 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-f-uchar.c b/stdio-common/tst-scanf-format-f-uchar.c
index 0037aea..6d0ab1a 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-f-uint.c b/stdio-common/tst-scanf-format-f-uint.c
index 6e7a85a..b7971f8 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-f-ullong.c b/stdio-common/tst-scanf-format-f-ullong.c
index 71124ea..5faa5d6 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-f-ulong.c b/stdio-common/tst-scanf-format-f-ulong.c
index c0226c6..ba66498 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-f-ushort.c b/stdio-common/tst-scanf-format-f-ushort.c
index b4aeb339..35264ee 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-s-c.c b/stdio-common/tst-scanf-format-s-c.c
index bbfc000..6778cd1 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-s-char.c b/stdio-common/tst-scanf-format-s-char.c
index c13527d..b06756a 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-s-double.c b/stdio-common/tst-scanf-format-s-double.c
index 4baad01..8af7b91 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-s-float.c b/stdio-common/tst-scanf-format-s-float.c
index 301b262..b14f4c4 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-s-int.c b/stdio-common/tst-scanf-format-s-int.c
index e176fe9..368aafc 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-s-ldouble.c b/stdio-common/tst-scanf-format-s-ldouble.c
index dbb007c..67718c2 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-s-llong.c b/stdio-common/tst-scanf-format-s-llong.c
index fe3d11a..51a98e7 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-s-long.c b/stdio-common/tst-scanf-format-s-long.c
index 415e5fa..2061d9c 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-s-short.c b/stdio-common/tst-scanf-format-s-short.c
index d545ee2..11a7bc1 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-s-uchar.c b/stdio-common/tst-scanf-format-s-uchar.c
index a1a7f73..abde422 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-s-uint.c b/stdio-common/tst-scanf-format-s-uint.c
index 27b0f4a..b51f11e 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-s-ullong.c b/stdio-common/tst-scanf-format-s-ullong.c
index 9cc45b4..0ecf363 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-s-ulong.c b/stdio-common/tst-scanf-format-s-ulong.c
index 9c5543e..9531e7c 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-s-ushort.c b/stdio-common/tst-scanf-format-s-ushort.c
index 052a1ca..49ff05b 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-skeleton-c.c b/stdio-common/tst-scanf-format-skeleton-c.c
index 181077f..a25fda0 100644
--- 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"
diff --git a/stdio-common/tst-scanf-format-skeleton-char.c b/stdio-common/tst-scanf-format-skeleton-char.c
index a694de4..b419d94 100644
--- 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"
diff --git a/stdio-common/tst-scanf-format-skeleton-double.c b/stdio-common/tst-scanf-format-skeleton-double.c
index 502f2ad..c3aeef7 100644
--- 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"
diff --git a/stdio-common/tst-scanf-format-skeleton-float.c b/stdio-common/tst-scanf-format-skeleton-float.c
index 2104c0f..5b34ee8 100644
--- 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"
diff --git a/stdio-common/tst-scanf-format-skeleton-int.c b/stdio-common/tst-scanf-format-skeleton-int.c
index eb4e9de..483d4a9 100644
--- 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"
diff --git a/stdio-common/tst-scanf-format-skeleton-ldouble.c b/stdio-common/tst-scanf-format-skeleton-ldouble.c
index 3649110..83a3de7 100644
--- 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"
diff --git a/stdio-common/tst-scanf-format-skeleton-llong.c b/stdio-common/tst-scanf-format-skeleton-llong.c
index 8b8324e..e669f41 100644
--- 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"
diff --git a/stdio-common/tst-scanf-format-skeleton-long.c b/stdio-common/tst-scanf-format-skeleton-long.c
index 91aa091..cdf3cc3 100644
--- 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"
diff --git a/stdio-common/tst-scanf-format-skeleton-short.c b/stdio-common/tst-scanf-format-skeleton-short.c
index ca51a25..329722c 100644
--- 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"
diff --git a/stdio-common/tst-scanf-format-skeleton-uchar.c b/stdio-common/tst-scanf-format-skeleton-uchar.c
index 6be8917..fb52e1e 100644
--- 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"
diff --git a/stdio-common/tst-scanf-format-skeleton-uint.c b/stdio-common/tst-scanf-format-skeleton-uint.c
index 1508dc3..5b5a643 100644
--- 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"
diff --git a/stdio-common/tst-scanf-format-skeleton-ullong.c b/stdio-common/tst-scanf-format-skeleton-ullong.c
index b0b8050..99dc8a7 100644
--- 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"
diff --git a/stdio-common/tst-scanf-format-skeleton-ulong.c b/stdio-common/tst-scanf-format-skeleton-ulong.c
index 3198825..e0989b3 100644
--- 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"
diff --git a/stdio-common/tst-scanf-format-skeleton-ushort.c b/stdio-common/tst-scanf-format-skeleton-ushort.c
index 2b710c5..fe006d2 100644
--- 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"
diff --git a/stdio-common/tst-scanf-format-ss-c.c b/stdio-common/tst-scanf-format-ss-c.c
index 2dcb6a2..02e79eb 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-ss-char.c b/stdio-common/tst-scanf-format-ss-char.c
index 8e8fbf4..268914a 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-ss-double.c b/stdio-common/tst-scanf-format-ss-double.c
index a272ef7..da29cfb 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-ss-float.c b/stdio-common/tst-scanf-format-ss-float.c
index 23818b6..01ccea4 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-ss-int.c b/stdio-common/tst-scanf-format-ss-int.c
index 99f8e9d..8367995 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-ss-ldouble.c b/stdio-common/tst-scanf-format-ss-ldouble.c
index ddfe50f..842d758 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-ss-llong.c b/stdio-common/tst-scanf-format-ss-llong.c
index 642cbe9..04d802d 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-ss-long.c b/stdio-common/tst-scanf-format-ss-long.c
index a1d302c..4850e02 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-ss-short.c b/stdio-common/tst-scanf-format-ss-short.c
index 87aac39..f1d6a83 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-ss-uchar.c b/stdio-common/tst-scanf-format-ss-uchar.c
index fb70215..ee8eede 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-ss-uint.c b/stdio-common/tst-scanf-format-ss-uint.c
index ef8f274..9ba39dc 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-ss-ullong.c b/stdio-common/tst-scanf-format-ss-ullong.c
index c74d757..4b71d8c 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-ss-ulong.c b/stdio-common/tst-scanf-format-ss-ulong.c
index ac8644e..613ccaf 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-ss-ushort.c b/stdio-common/tst-scanf-format-ss-ushort.c
index 51ec0c3..9145969 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-v-c.c b/stdio-common/tst-scanf-format-v-c.c
index 15e4a41..6ff8782 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-v-char.c b/stdio-common/tst-scanf-format-v-char.c
index ed27c3c..7e1ccf7 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-v-double.c b/stdio-common/tst-scanf-format-v-double.c
index 6803d3a..5dfa110 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-v-float.c b/stdio-common/tst-scanf-format-v-float.c
index ecd0949..2243dd6 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-v-int.c b/stdio-common/tst-scanf-format-v-int.c
index 0574fc0..5d59e39 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-v-ldouble.c b/stdio-common/tst-scanf-format-v-ldouble.c
index 9adbb81..0527f0d 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-v-llong.c b/stdio-common/tst-scanf-format-v-llong.c
index 427be60..3f635d9 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-v-long.c b/stdio-common/tst-scanf-format-v-long.c
index 9b10ff6..3473093 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-v-short.c b/stdio-common/tst-scanf-format-v-short.c
index 597e7ea..61a66ba 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-v-uchar.c b/stdio-common/tst-scanf-format-v-uchar.c
index 9cb0d22..7e98b61 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-v-uint.c b/stdio-common/tst-scanf-format-v-uint.c
index af8eab2..82ae619 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-v-ullong.c b/stdio-common/tst-scanf-format-v-ullong.c
index bf7ff85..a767906 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-v-ulong.c b/stdio-common/tst-scanf-format-v-ulong.c
index 0d3d8b7..1b50b79 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-v-ushort.c b/stdio-common/tst-scanf-format-v-ushort.c
index 27bde53..e268273 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vf-c.c b/stdio-common/tst-scanf-format-vf-c.c
index f6e6bcd..d69b816 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vf-char.c b/stdio-common/tst-scanf-format-vf-char.c
index 0d9a28c..7ce3b1c 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vf-double.c b/stdio-common/tst-scanf-format-vf-double.c
index bc0e315..5965144 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vf-float.c b/stdio-common/tst-scanf-format-vf-float.c
index 7b8a2a1..34b069d 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vf-int.c b/stdio-common/tst-scanf-format-vf-int.c
index e055b62..289595b 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vf-ldouble.c b/stdio-common/tst-scanf-format-vf-ldouble.c
index 8c55575..3393703 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vf-llong.c b/stdio-common/tst-scanf-format-vf-llong.c
index 3ef4a77..ccc0912 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vf-long.c b/stdio-common/tst-scanf-format-vf-long.c
index c5eb1e5..d5499af 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vf-short.c b/stdio-common/tst-scanf-format-vf-short.c
index 9c6e2c4..715967d 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vf-uchar.c b/stdio-common/tst-scanf-format-vf-uchar.c
index b24fb60..6163545 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vf-uint.c b/stdio-common/tst-scanf-format-vf-uint.c
index 0434b41..af240c5 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vf-ullong.c b/stdio-common/tst-scanf-format-vf-ullong.c
index 020d0d5..4863b48 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vf-ulong.c b/stdio-common/tst-scanf-format-vf-ulong.c
index 28e5efd..886c771 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vf-ushort.c b/stdio-common/tst-scanf-format-vf-ushort.c
index eca5fd2..b356598 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vs-c.c b/stdio-common/tst-scanf-format-vs-c.c
index 19875e0..fb3f380 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vs-char.c b/stdio-common/tst-scanf-format-vs-char.c
index 3f06ff7..5161d72 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vs-double.c b/stdio-common/tst-scanf-format-vs-double.c
index 910d9f8..042d3d9 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vs-float.c b/stdio-common/tst-scanf-format-vs-float.c
index 71566ee..2d25132 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vs-int.c b/stdio-common/tst-scanf-format-vs-int.c
index bee2430..b3a40d6 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vs-ldouble.c b/stdio-common/tst-scanf-format-vs-ldouble.c
index a744d96..0ccc6b6 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vs-llong.c b/stdio-common/tst-scanf-format-vs-llong.c
index d0368ed..100587e 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vs-long.c b/stdio-common/tst-scanf-format-vs-long.c
index 4949f18..6f609d1 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vs-short.c b/stdio-common/tst-scanf-format-vs-short.c
index 47ee05e..e97faee 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vs-uchar.c b/stdio-common/tst-scanf-format-vs-uchar.c
index 7948035..2ec9c89 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vs-uint.c b/stdio-common/tst-scanf-format-vs-uint.c
index 7832e80..40553cf 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vs-ullong.c b/stdio-common/tst-scanf-format-vs-ullong.c
index 63ac934..a50e173 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vs-ulong.c b/stdio-common/tst-scanf-format-vs-ulong.c
index 3debd44..e2076b6 100644
--- 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>
diff --git a/stdio-common/tst-scanf-format-vs-ushort.c b/stdio-common/tst-scanf-format-vs-ushort.c
index 92f19a9..af2a63f 100644
--- 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>
diff --git a/sysdeps/ieee754/ldbl-96/tst-scanf-format-skeleton-ldouble.c b/sysdeps/ieee754/ldbl-96/tst-scanf-format-skeleton-ldouble.c
index 7e8c1d6..79903cc 100644
--- 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"