stdio-common: Include correct skeleton in scanf input specifier tests

Follow 'scanf' itself and use the system header inclusion variant for
the data-type-specific skeleton consistently across the remaining scanf
family functions so that any sysdeps/ variant takes precedence even in
the presence of a corresponding skeleton in stdio-common/ (though we
have no such arrangement at the moment).

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>

70 files changed, 70 insertions, 70 deletions

diff --git a/stdio-common/tst-scanf-format-f-c.c b/stdio-common/tst-scanf-format-f-c.c
index 75ce3cd..144221a 100644
--- a/stdio-common/tst-scanf-format-f-c.c
+++ b/stdio-common/tst-scanf-format-f-c.c
@@ -19,4 +19,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"
+#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 ee5fbe9..efa7c1a 100644
--- a/stdio-common/tst-scanf-format-f-char.c
+++ b/stdio-common/tst-scanf-format-f-char.c
@@ -19,4 +19,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"
+#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 1fb25b5..668a975 100644
--- a/stdio-common/tst-scanf-format-f-double.c
+++ b/stdio-common/tst-scanf-format-f-double.c
@@ -19,4 +19,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"
+#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 b5a6ae4..07d65ef 100644
--- a/stdio-common/tst-scanf-format-f-float.c
+++ b/stdio-common/tst-scanf-format-f-float.c
@@ -19,4 +19,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"
+#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 961d66b..4b1a5f0 100644
--- a/stdio-common/tst-scanf-format-f-int.c
+++ b/stdio-common/tst-scanf-format-f-int.c
@@ -19,4 +19,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"
+#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 6198d35..2aacd9d 100644
--- a/stdio-common/tst-scanf-format-f-ldouble.c
+++ b/stdio-common/tst-scanf-format-f-ldouble.c
@@ -19,4 +19,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"
+#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 1af672f..45d0f8b 100644
--- a/stdio-common/tst-scanf-format-f-llong.c
+++ b/stdio-common/tst-scanf-format-f-llong.c
@@ -19,4 +19,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"
+#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 fc90811..bcb2e23 100644
--- a/stdio-common/tst-scanf-format-f-long.c
+++ b/stdio-common/tst-scanf-format-f-long.c
@@ -19,4 +19,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"
+#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 61697e2..e384f3d 100644
--- a/stdio-common/tst-scanf-format-f-short.c
+++ b/stdio-common/tst-scanf-format-f-short.c
@@ -19,4 +19,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"
+#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 b4b8af3..0037aea 100644
--- a/stdio-common/tst-scanf-format-f-uchar.c
+++ b/stdio-common/tst-scanf-format-f-uchar.c
@@ -19,4 +19,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"
+#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 af226b0..6e7a85a 100644
--- a/stdio-common/tst-scanf-format-f-uint.c
+++ b/stdio-common/tst-scanf-format-f-uint.c
@@ -19,4 +19,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"
+#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 50ea812..71124ea 100644
--- a/stdio-common/tst-scanf-format-f-ullong.c
+++ b/stdio-common/tst-scanf-format-f-ullong.c
@@ -19,4 +19,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"
+#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 673e770..c0226c6 100644
--- a/stdio-common/tst-scanf-format-f-ulong.c
+++ b/stdio-common/tst-scanf-format-f-ulong.c
@@ -19,4 +19,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"
+#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 413ba67..b4aeb339 100644
--- a/stdio-common/tst-scanf-format-f-ushort.c
+++ b/stdio-common/tst-scanf-format-f-ushort.c
@@ -19,4 +19,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"
+#include <tst-scanf-format-skeleton-ushort.c>
diff --git a/stdio-common/tst-scanf-format-ss-c.c b/stdio-common/tst-scanf-format-ss-c.c
index 58a7ce8..2dcb6a2 100644
--- a/stdio-common/tst-scanf-format-ss-c.c
+++ b/stdio-common/tst-scanf-format-ss-c.c
@@ -19,4 +19,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"
+#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 66eb04c..8e8fbf4 100644
--- a/stdio-common/tst-scanf-format-ss-char.c
+++ b/stdio-common/tst-scanf-format-ss-char.c
@@ -19,4 +19,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"
+#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 2a9fd8a..a272ef7 100644
--- a/stdio-common/tst-scanf-format-ss-double.c
+++ b/stdio-common/tst-scanf-format-ss-double.c
@@ -19,4 +19,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"
+#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 640e35d..23818b6 100644
--- a/stdio-common/tst-scanf-format-ss-float.c
+++ b/stdio-common/tst-scanf-format-ss-float.c
@@ -19,4 +19,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"
+#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 c01a0a3..99f8e9d 100644
--- a/stdio-common/tst-scanf-format-ss-int.c
+++ b/stdio-common/tst-scanf-format-ss-int.c
@@ -19,4 +19,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"
+#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 3e57ab5..ddfe50f 100644
--- a/stdio-common/tst-scanf-format-ss-ldouble.c
+++ b/stdio-common/tst-scanf-format-ss-ldouble.c
@@ -19,4 +19,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"
+#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 9c1603c..642cbe9 100644
--- a/stdio-common/tst-scanf-format-ss-llong.c
+++ b/stdio-common/tst-scanf-format-ss-llong.c
@@ -19,4 +19,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"
+#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 003cfac..a1d302c 100644
--- a/stdio-common/tst-scanf-format-ss-long.c
+++ b/stdio-common/tst-scanf-format-ss-long.c
@@ -19,4 +19,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"
+#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 ba1a582..87aac39 100644
--- a/stdio-common/tst-scanf-format-ss-short.c
+++ b/stdio-common/tst-scanf-format-ss-short.c
@@ -19,4 +19,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"
+#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 1db1424..fb70215 100644
--- a/stdio-common/tst-scanf-format-ss-uchar.c
+++ b/stdio-common/tst-scanf-format-ss-uchar.c
@@ -19,4 +19,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"
+#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 a296fb4..ef8f274 100644
--- a/stdio-common/tst-scanf-format-ss-uint.c
+++ b/stdio-common/tst-scanf-format-ss-uint.c
@@ -19,4 +19,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"
+#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 885d570..c74d757 100644
--- a/stdio-common/tst-scanf-format-ss-ullong.c
+++ b/stdio-common/tst-scanf-format-ss-ullong.c
@@ -19,4 +19,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"
+#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 8a2f24d..ac8644e 100644
--- a/stdio-common/tst-scanf-format-ss-ulong.c
+++ b/stdio-common/tst-scanf-format-ss-ulong.c
@@ -19,4 +19,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"
+#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 4061888..51ec0c3 100644
--- a/stdio-common/tst-scanf-format-ss-ushort.c
+++ b/stdio-common/tst-scanf-format-ss-ushort.c
@@ -19,4 +19,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"
+#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 0e2c000..15e4a41 100644
--- a/stdio-common/tst-scanf-format-v-c.c
+++ b/stdio-common/tst-scanf-format-v-c.c
@@ -19,4 +19,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"
+#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 be3a56c..ed27c3c 100644
--- a/stdio-common/tst-scanf-format-v-char.c
+++ b/stdio-common/tst-scanf-format-v-char.c
@@ -19,4 +19,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"
+#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 9188631..6803d3a 100644
--- a/stdio-common/tst-scanf-format-v-double.c
+++ b/stdio-common/tst-scanf-format-v-double.c
@@ -19,4 +19,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"
+#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 5d289d3..ecd0949 100644
--- a/stdio-common/tst-scanf-format-v-float.c
+++ b/stdio-common/tst-scanf-format-v-float.c
@@ -19,4 +19,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"
+#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 770a686..0574fc0 100644
--- a/stdio-common/tst-scanf-format-v-int.c
+++ b/stdio-common/tst-scanf-format-v-int.c
@@ -19,4 +19,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"
+#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 8215ea7..9adbb81 100644
--- a/stdio-common/tst-scanf-format-v-ldouble.c
+++ b/stdio-common/tst-scanf-format-v-ldouble.c
@@ -19,4 +19,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"
+#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 2a1ef02..427be60 100644
--- a/stdio-common/tst-scanf-format-v-llong.c
+++ b/stdio-common/tst-scanf-format-v-llong.c
@@ -19,4 +19,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"
+#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 8376032..9b10ff6 100644
--- a/stdio-common/tst-scanf-format-v-long.c
+++ b/stdio-common/tst-scanf-format-v-long.c
@@ -19,4 +19,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"
+#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 23b9c56..597e7ea 100644
--- a/stdio-common/tst-scanf-format-v-short.c
+++ b/stdio-common/tst-scanf-format-v-short.c
@@ -19,4 +19,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"
+#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 861db22..9cb0d22 100644
--- a/stdio-common/tst-scanf-format-v-uchar.c
+++ b/stdio-common/tst-scanf-format-v-uchar.c
@@ -19,4 +19,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"
+#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 30e58c5..af8eab2 100644
--- a/stdio-common/tst-scanf-format-v-uint.c
+++ b/stdio-common/tst-scanf-format-v-uint.c
@@ -19,4 +19,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"
+#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 ee2914d..bf7ff85 100644
--- a/stdio-common/tst-scanf-format-v-ullong.c
+++ b/stdio-common/tst-scanf-format-v-ullong.c
@@ -19,4 +19,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"
+#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 f7864dd..0d3d8b7 100644
--- a/stdio-common/tst-scanf-format-v-ulong.c
+++ b/stdio-common/tst-scanf-format-v-ulong.c
@@ -19,4 +19,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"
+#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 79ca16b..27bde53 100644
--- a/stdio-common/tst-scanf-format-v-ushort.c
+++ b/stdio-common/tst-scanf-format-v-ushort.c
@@ -19,4 +19,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"
+#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 307bfe8..f6e6bcd 100644
--- a/stdio-common/tst-scanf-format-vf-c.c
+++ b/stdio-common/tst-scanf-format-vf-c.c
@@ -19,4 +19,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"
+#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 602899b..0d9a28c 100644
--- a/stdio-common/tst-scanf-format-vf-char.c
+++ b/stdio-common/tst-scanf-format-vf-char.c
@@ -19,4 +19,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"
+#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 8b58bbe..bc0e315 100644
--- a/stdio-common/tst-scanf-format-vf-double.c
+++ b/stdio-common/tst-scanf-format-vf-double.c
@@ -19,4 +19,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"
+#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 81dad06..7b8a2a1 100644
--- a/stdio-common/tst-scanf-format-vf-float.c
+++ b/stdio-common/tst-scanf-format-vf-float.c
@@ -19,4 +19,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"
+#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 8038791..e055b62 100644
--- a/stdio-common/tst-scanf-format-vf-int.c
+++ b/stdio-common/tst-scanf-format-vf-int.c
@@ -19,4 +19,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"
+#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 ec9a7c4..8c55575 100644
--- a/stdio-common/tst-scanf-format-vf-ldouble.c
+++ b/stdio-common/tst-scanf-format-vf-ldouble.c
@@ -19,4 +19,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"
+#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 adc4b12..3ef4a77 100644
--- a/stdio-common/tst-scanf-format-vf-llong.c
+++ b/stdio-common/tst-scanf-format-vf-llong.c
@@ -19,4 +19,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"
+#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 5f26d6c..c5eb1e5 100644
--- a/stdio-common/tst-scanf-format-vf-long.c
+++ b/stdio-common/tst-scanf-format-vf-long.c
@@ -19,4 +19,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"
+#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 0e081ea..9c6e2c4 100644
--- a/stdio-common/tst-scanf-format-vf-short.c
+++ b/stdio-common/tst-scanf-format-vf-short.c
@@ -19,4 +19,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"
+#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 2e879f5..b24fb60 100644
--- a/stdio-common/tst-scanf-format-vf-uchar.c
+++ b/stdio-common/tst-scanf-format-vf-uchar.c
@@ -19,4 +19,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"
+#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 4874f86..0434b41 100644
--- a/stdio-common/tst-scanf-format-vf-uint.c
+++ b/stdio-common/tst-scanf-format-vf-uint.c
@@ -19,4 +19,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"
+#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 dde0901..020d0d5 100644
--- a/stdio-common/tst-scanf-format-vf-ullong.c
+++ b/stdio-common/tst-scanf-format-vf-ullong.c
@@ -19,4 +19,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"
+#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 8102306..28e5efd 100644
--- a/stdio-common/tst-scanf-format-vf-ulong.c
+++ b/stdio-common/tst-scanf-format-vf-ulong.c
@@ -19,4 +19,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"
+#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 cb8eb4b..eca5fd2 100644
--- a/stdio-common/tst-scanf-format-vf-ushort.c
+++ b/stdio-common/tst-scanf-format-vf-ushort.c
@@ -19,4 +19,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"
+#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 2df5aa7..19875e0 100644
--- a/stdio-common/tst-scanf-format-vs-c.c
+++ b/stdio-common/tst-scanf-format-vs-c.c
@@ -19,4 +19,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"
+#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 ae4d8e0..3f06ff7 100644
--- a/stdio-common/tst-scanf-format-vs-char.c
+++ b/stdio-common/tst-scanf-format-vs-char.c
@@ -19,4 +19,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"
+#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 cd459a8..910d9f8 100644
--- a/stdio-common/tst-scanf-format-vs-double.c
+++ b/stdio-common/tst-scanf-format-vs-double.c
@@ -19,4 +19,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"
+#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 7872afe..71566ee 100644
--- a/stdio-common/tst-scanf-format-vs-float.c
+++ b/stdio-common/tst-scanf-format-vs-float.c
@@ -19,4 +19,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"
+#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 e67b4be..bee2430 100644
--- a/stdio-common/tst-scanf-format-vs-int.c
+++ b/stdio-common/tst-scanf-format-vs-int.c
@@ -19,4 +19,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"
+#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 4d299c2..a744d96 100644
--- a/stdio-common/tst-scanf-format-vs-ldouble.c
+++ b/stdio-common/tst-scanf-format-vs-ldouble.c
@@ -19,4 +19,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"
+#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 06c8cc9..d0368ed 100644
--- a/stdio-common/tst-scanf-format-vs-llong.c
+++ b/stdio-common/tst-scanf-format-vs-llong.c
@@ -19,4 +19,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"
+#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 575a6cb..4949f18 100644
--- a/stdio-common/tst-scanf-format-vs-long.c
+++ b/stdio-common/tst-scanf-format-vs-long.c
@@ -19,4 +19,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"
+#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 5473471..47ee05e 100644
--- a/stdio-common/tst-scanf-format-vs-short.c
+++ b/stdio-common/tst-scanf-format-vs-short.c
@@ -19,4 +19,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"
+#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 5a29b9b..7948035 100644
--- a/stdio-common/tst-scanf-format-vs-uchar.c
+++ b/stdio-common/tst-scanf-format-vs-uchar.c
@@ -19,4 +19,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"
+#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 b9486b1..7832e80 100644
--- a/stdio-common/tst-scanf-format-vs-uint.c
+++ b/stdio-common/tst-scanf-format-vs-uint.c
@@ -19,4 +19,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"
+#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 5396a78..63ac934 100644
--- a/stdio-common/tst-scanf-format-vs-ullong.c
+++ b/stdio-common/tst-scanf-format-vs-ullong.c
@@ -19,4 +19,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"
+#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 3dbc142..3debd44 100644
--- a/stdio-common/tst-scanf-format-vs-ulong.c
+++ b/stdio-common/tst-scanf-format-vs-ulong.c
@@ -19,4 +19,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"
+#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 0f28b36..92f19a9 100644
--- a/stdio-common/tst-scanf-format-vs-ushort.c
+++ b/stdio-common/tst-scanf-format-vs-ushort.c
@@ -19,4 +19,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"
+#include <tst-scanf-format-skeleton-ushort.c>