diff --git a/include/30-test.i b/include/30-test.i
deleted file mode 100644
index a6f70786..00000000
--- a/include/30-test.i
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*-comment-start: "//";comment-end:""-*-
- * GNU Mes --- Maxwell Equations of Software
- * Copyright © 2017 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
- *
- * This file is part of GNU Mes.
- *
- * GNU Mes is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or (at
- * your option) any later version.
- *
- * GNU Mes is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <libmes.h>
-
-int test ();
-
-int
-main ()
-{
-  int r = test ();
-  return r;
-}
diff --git a/scaffold/tests/30-strlen.c b/scaffold/tests/30-strlen.c
index 64de98c1..8f395d32 100644
--- a/scaffold/tests/30-strlen.c
+++ b/scaffold/tests/30-strlen.c
@@ -18,10 +18,10 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 
 int
-test ()
+main ()
 {
   if (strlen ("mes") == 3) goto ok;
   return 1;
diff --git a/scaffold/tests/31-eputs.c b/scaffold/tests/31-eputs.c
index 4bdfc822..ddf71d4b 100644
--- a/scaffold/tests/31-eputs.c
+++ b/scaffold/tests/31-eputs.c
@@ -18,11 +18,11 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 
 int
-test ()
+main ()
 {
   puts ("\n");
   puts ("mes");
diff --git a/scaffold/tests/32-compare.c b/scaffold/tests/32-compare.c
index 61c0e80b..dd3e2317 100644
--- a/scaffold/tests/32-compare.c
+++ b/scaffold/tests/32-compare.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 
 int isid(char c) {
@@ -26,7 +26,7 @@ int isid(char c) {
 }
 
 int
-test ()
+main ()
 {
   int f = 0;
   int t = 1;
diff --git a/scaffold/tests/33-and-or.c b/scaffold/tests/33-and-or.c
index e2f0b0f3..d1a48e30 100644
--- a/scaffold/tests/33-and-or.c
+++ b/scaffold/tests/33-and-or.c
@@ -18,11 +18,11 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 
 int
-test ()
+main ()
 {
   int f = 0;
   int t = 1;
diff --git a/scaffold/tests/34-pre-post.c b/scaffold/tests/34-pre-post.c
index 7fd860e7..7a30801f 100644
--- a/scaffold/tests/34-pre-post.c
+++ b/scaffold/tests/34-pre-post.c
@@ -18,11 +18,11 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 
 int
-test ()
+main ()
 {
   int f = 0;
   int t = 1;
diff --git a/scaffold/tests/35-compare-char.c b/scaffold/tests/35-compare-char.c
index 0c907710..ff48a99f 100644
--- a/scaffold/tests/35-compare-char.c
+++ b/scaffold/tests/35-compare-char.c
@@ -18,14 +18,14 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 
 char g_arena[10];
 char *g_chars = g_arena;
 
 int
-test ()
+main ()
 {
   int i = 0;
   char c = 'C';
diff --git a/scaffold/tests/36-compare-arithmetic.c b/scaffold/tests/36-compare-arithmetic.c
index 97ef09b0..203a14a3 100644
--- a/scaffold/tests/36-compare-arithmetic.c
+++ b/scaffold/tests/36-compare-arithmetic.c
@@ -18,11 +18,11 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 
 int
-test ()
+main ()
 {
   puts ("\n");
   puts ("t: 1 + 2\n");
diff --git a/scaffold/tests/37-compare-assign.c b/scaffold/tests/37-compare-assign.c
index 77d74ebc..efbc658a 100644
--- a/scaffold/tests/37-compare-assign.c
+++ b/scaffold/tests/37-compare-assign.c
@@ -18,11 +18,11 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 
 int
-test ()
+main ()
 {
   int f = 0;
   int t = 1;
diff --git a/scaffold/tests/38-compare-call.c b/scaffold/tests/38-compare-call.c
index 587d7df5..7a0c55cb 100644
--- a/scaffold/tests/38-compare-call.c
+++ b/scaffold/tests/38-compare-call.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -43,7 +43,7 @@ identity (int i)
 }
 
 int
-test ()
+main ()
 {
   int i = 0;
   int f = 0;
diff --git a/scaffold/tests/40-if-else.c b/scaffold/tests/40-if-else.c
index 6633a3cd..f34d4aa2 100644
--- a/scaffold/tests/40-if-else.c
+++ b/scaffold/tests/40-if-else.c
@@ -18,11 +18,11 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 
 int
-test ()
+main ()
 {
   int i = 0;
 
diff --git a/scaffold/tests/41-?.c b/scaffold/tests/41-?.c
index 90e4cfbe..516a3944 100644
--- a/scaffold/tests/41-?.c
+++ b/scaffold/tests/41-?.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 
 union foo
@@ -27,7 +27,7 @@ union foo
 };
 
 int
-test ()
+main ()
 {
   int f;
   int t = 1;
diff --git a/scaffold/tests/42-goto-label.c b/scaffold/tests/42-goto-label.c
index e844536d..dfb3edfb 100644
--- a/scaffold/tests/42-goto-label.c
+++ b/scaffold/tests/42-goto-label.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 
 int
@@ -32,7 +32,7 @@ label (int c)
 }
 
 int
-test ()
+main ()
 {
   int f;
   int t = 1;
diff --git a/scaffold/tests/43-for-do-while.c b/scaffold/tests/43-for-do-while.c
index 1d7e29d3..b07c5ed1 100644
--- a/scaffold/tests/43-for-do-while.c
+++ b/scaffold/tests/43-for-do-while.c
@@ -18,11 +18,11 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 
 int
-test ()
+main ()
 {
   int i = 0;
   int f = 0;
diff --git a/scaffold/tests/44-switch.c b/scaffold/tests/44-switch.c
index f76e50ad..5db8ad55 100644
--- a/scaffold/tests/44-switch.c
+++ b/scaffold/tests/44-switch.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 
 enum type_t {TCHAR, TCLOSURE, TCONTINUATION, TFUNCTION, TKEYWORD, TMACRO, TNUMBER, TPAIR, TREF, TSPECIAL, TSTRING, TSYMBOL, TVALUES, TVECTOR, TBROKEN_HEART};
@@ -88,7 +88,7 @@ default_first (int c)
 }
 
 int
-test ()
+main ()
 {
   puts ("\n");
   puts ("t: switch 0\n");
diff --git a/scaffold/tests/45-void-call.c b/scaffold/tests/45-void-call.c
index f3456047..8e015b59 100644
--- a/scaffold/tests/45-void-call.c
+++ b/scaffold/tests/45-void-call.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 
 void
@@ -27,7 +27,7 @@ void_func ()
 }
 
 int
-test ()
+main ()
 {
   puts ("\n");
   puts ("void_func ()\n");
diff --git a/scaffold/tests/50-assert.c b/scaffold/tests/50-assert.c
index d41c1085..73c197d8 100644
--- a/scaffold/tests/50-assert.c
+++ b/scaffold/tests/50-assert.c
@@ -18,12 +18,12 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <assert.h>
 #include <stdio.h>
 
 int
-test ()
+main ()
 {
   int f;
 
diff --git a/scaffold/tests/51-strcmp.c b/scaffold/tests/51-strcmp.c
index f8cb72ad..f0b1c02d 100644
--- a/scaffold/tests/51-strcmp.c
+++ b/scaffold/tests/51-strcmp.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
@@ -40,7 +40,7 @@ strncmp (char const* a, char const* b, size_t size)
 #endif
 
 int
-test ()
+main ()
 {
   char *p = "mes";
 
diff --git a/scaffold/tests/52-itoa.c b/scaffold/tests/52-itoa.c
index 64a4b4ad..080c4b48 100644
--- a/scaffold/tests/52-itoa.c
+++ b/scaffold/tests/52-itoa.c
@@ -18,13 +18,13 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <libmes.h>
 #include <stdlib.h>
 #include <string.h>
 
 int
-test ()
+main ()
 {
   char *p = "mes";
 
diff --git a/scaffold/tests/53-strcpy.c b/scaffold/tests/53-strcpy.c
index 5c0d9229..a87442fd 100644
--- a/scaffold/tests/53-strcpy.c
+++ b/scaffold/tests/53-strcpy.c
@@ -18,12 +18,12 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 #include <string.h>
 
 int
-test ()
+main ()
 {
   puts ("\n");
   puts ("t: strcpy (buf, \"mes\")\n");
diff --git a/scaffold/tests/60-math.c b/scaffold/tests/60-math.c
index f3f3ae82..1ab80764 100644
--- a/scaffold/tests/60-math.c
+++ b/scaffold/tests/60-math.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "30-test.i"
+#include <libmes.h>
 
 int
 add (int a, int b)
@@ -37,7 +37,7 @@ inc (int i)
 }
 
 int
-test ()
+main ()
 {
   int i;
 
diff --git a/scaffold/tests/63-struct-cell.c b/scaffold/tests/63-struct-cell.c
index 6297eddf..204d6d61 100644
--- a/scaffold/tests/63-struct-cell.c
+++ b/scaffold/tests/63-struct-cell.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 
 // #include <stdio.h>
 #include <stdlib.h>
@@ -88,7 +88,7 @@ int g_function = 0;
 
 
 int
-test ()
+main ()
 {
  //  puts ("\n");
  //  puts ("t: g_cells[0] = g_cells[1]\n");
diff --git a/scaffold/tests/64-make-cell.c b/scaffold/tests/64-make-cell.c
index ca7ee6da..0b3402ed 100644
--- a/scaffold/tests/64-make-cell.c
+++ b/scaffold/tests/64-make-cell.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -120,7 +120,7 @@ make_tmps_test (struct scm* cells)
 }
 
 int
-test ()
+main ()
 {
   puts ("\n");
   make_tmps_test (g_cells);
diff --git a/scaffold/tests/65-read.c b/scaffold/tests/65-read.c
index 17a6f829..a87d4c7f 100644
--- a/scaffold/tests/65-read.c
+++ b/scaffold/tests/65-read.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -48,7 +48,7 @@ get ()
 }
 
 int
-test ()
+main ()
 {
   char *p = (char*)g_chars;
   int i = 0;
diff --git a/scaffold/tests/66-local-char-array.c b/scaffold/tests/66-local-char-array.c
index 75ade88a..e6489ca3 100644
--- a/scaffold/tests/66-local-char-array.c
+++ b/scaffold/tests/66-local-char-array.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -81,7 +81,7 @@ char* LittleEndian(unsigned value, char* c, int Number_of_bytes)
 }
 
 int
-test ()
+main ()
 {
   char table[3] = {'0', '1', '2'};
 
diff --git a/scaffold/tests/70-printf.c b/scaffold/tests/70-printf.c
index ece6d299..a812d7f4 100644
--- a/scaffold/tests/70-printf.c
+++ b/scaffold/tests/70-printf.c
@@ -18,13 +18,13 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
 
 int
-test ()
+main ()
 {
   char *s = "mes";
   char c = 'm';
diff --git a/scaffold/tests/71-struct-array.c b/scaffold/tests/71-struct-array.c
index d7a7473c..33614958 100644
--- a/scaffold/tests/71-struct-array.c
+++ b/scaffold/tests/71-struct-array.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -49,7 +49,7 @@ typedef struct baz
 } baz;
 
 int
-test ()
+main ()
 {
   foo_struct f;
   f.bar[0] = 0x22;
diff --git a/scaffold/tests/72-typedef-struct-def.c b/scaffold/tests/72-typedef-struct-def.c
index aac004fc..b79992ab 100644
--- a/scaffold/tests/72-typedef-struct-def.c
+++ b/scaffold/tests/72-typedef-struct-def.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 
 typedef struct foo
@@ -47,7 +47,7 @@ bar *list[2];
 #endif
 
 int
-test ()
+main ()
 {
   foo f = {1};
   printf ("f.i=%d\n", f.i);
diff --git a/scaffold/tests/73-union.c b/scaffold/tests/73-union.c
index cb5ea8ba..02dcfe37 100644
--- a/scaffold/tests/73-union.c
+++ b/scaffold/tests/73-union.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 
 typedef union foo
@@ -37,7 +37,7 @@ typedef union
 
 
 int
-test ()
+main ()
 {
   union foo f = {48};
   printf ("f.i=%d\n", f.i);
diff --git a/scaffold/tests/74-multi-line-string.c b/scaffold/tests/74-multi-line-string.c
index 1ceb360d..8909d91d 100644
--- a/scaffold/tests/74-multi-line-string.c
+++ b/scaffold/tests/74-multi-line-string.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -32,7 +32,7 @@ int global_i = 1;
 int *global_p = &global_i;
 
 int
-test ()
+main ()
 {
   if (printf ("belong to us\n"), strcmp (help, "All your base are")) return 1;
 
diff --git a/scaffold/tests/75-struct-union.c b/scaffold/tests/75-struct-union.c
index acd61972..ae146745 100644
--- a/scaffold/tests/75-struct-union.c
+++ b/scaffold/tests/75-struct-union.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 
 union u {
@@ -41,7 +41,7 @@ struct anon
 
 
 int
-test ()
+main ()
 {
   struct foo f = {2};
   printf ("f.u.bar=%d\n", f.u.bar);
diff --git a/scaffold/tests/76-pointer-arithmetic.c b/scaffold/tests/76-pointer-arithmetic.c
index 99c59654..e9e430b9 100644
--- a/scaffold/tests/76-pointer-arithmetic.c
+++ b/scaffold/tests/76-pointer-arithmetic.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 
 char *list[2] = {"foo\n", "bar\n"};
@@ -31,7 +31,7 @@ struct foo {
 };
 
 int
-test ()
+main ()
 {
   char *pc = 0;
   void *pv = 0;
diff --git a/scaffold/tests/77-pointer-assign.c b/scaffold/tests/77-pointer-assign.c
index 0e3ad3fd..053f3c37 100644
--- a/scaffold/tests/77-pointer-assign.c
+++ b/scaffold/tests/77-pointer-assign.c
@@ -20,7 +20,7 @@
 
 #include <string.h>
 
-#include "30-test.i"
+#include <libmes.h>
 
 struct baz {
   int i;
@@ -58,7 +58,7 @@ add2 (void *ptab)
 struct foo *hash_ident[10];
 
 int
-test ()
+main ()
 {
   int i = 1;
   int *p = &i;
diff --git a/scaffold/tests/78-union-struct.c b/scaffold/tests/78-union-struct.c
index a1694c14..3dcbb5bc 100644
--- a/scaffold/tests/78-union-struct.c
+++ b/scaffold/tests/78-union-struct.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 
 #include <stdint.h>
 
@@ -34,7 +34,7 @@ union bar {
 union bar bar;
 
 int
-test ()
+main ()
 {
   bar.foo.i = 2;
   bar.foo.p = "hallo";
diff --git a/scaffold/tests/79-int-array.c b/scaffold/tests/79-int-array.c
index 89ed4b69..60712897 100644
--- a/scaffold/tests/79-int-array.c
+++ b/scaffold/tests/79-int-array.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 
 #include <libmes.h>
 #include <stdio.h>
@@ -34,7 +34,7 @@ int bla[6] = {0,0,11223344, 55667788,0,0};
 int g_c[2] = {101, 111};
 
 int
-test ()
+main ()
 {
   f.bar = bla;
   struct foo *pf = &f;
diff --git a/scaffold/tests/7a-struct-char-array.c b/scaffold/tests/7a-struct-char-array.c
index b0c66120..ea9d0f9a 100644
--- a/scaffold/tests/7a-struct-char-array.c
+++ b/scaffold/tests/7a-struct-char-array.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -37,7 +37,7 @@ char *buffer = "aaaaaaaaaaaa";
 char *bufzor = "bbbbbbbbbbbb";
 
 int
-test ()
+main ()
 {
   char *p;
 
diff --git a/scaffold/tests/7b-struct-int-array.c b/scaffold/tests/7b-struct-int-array.c
index 51e51c70..129eaf89 100644
--- a/scaffold/tests/7b-struct-int-array.c
+++ b/scaffold/tests/7b-struct-int-array.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 
 struct foo {
   int a;
@@ -37,7 +37,7 @@ typedef struct bar bar_struct;
 typedef struct bar foo_struct;
 
 int
-test ()
+main ()
 {
   if (g_foo[0].a != 0) return 1;
   if (g_foo[0].b != 1) return 2;
diff --git a/scaffold/tests/7c-dynarray.c b/scaffold/tests/7c-dynarray.c
index 7d75dcb7..26a250d7 100644
--- a/scaffold/tests/7c-dynarray.c
+++ b/scaffold/tests/7c-dynarray.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 
 #include <libmes.h>
 #include <stdlib.h>
@@ -71,7 +71,7 @@ struct state {
 struct state g_s;
 
 int
-test ()
+main ()
 {
   struct state *s = &g_s;
 
diff --git a/scaffold/tests/7d-cast-char.c b/scaffold/tests/7d-cast-char.c
index d1c38756..e3062c03 100644
--- a/scaffold/tests/7d-cast-char.c
+++ b/scaffold/tests/7d-cast-char.c
@@ -18,10 +18,10 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 
 int
-test ()
+main ()
 {
   char *s = "int";
   char c = s[0];
diff --git a/scaffold/tests/7e-struct-array-access.c b/scaffold/tests/7e-struct-array-access.c
index 4da3f751..f54be651 100644
--- a/scaffold/tests/7e-struct-array-access.c
+++ b/scaffold/tests/7e-struct-array-access.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -69,7 +69,7 @@ find2 ()
 }
 
 int
-test ()
+main ()
 {
   char *s = find0 ();
   eputs (s); eputs ("\n");
diff --git a/scaffold/tests/7f-struct-pointer-arithmetic.c b/scaffold/tests/7f-struct-pointer-arithmetic.c
index 6ccef584..8738ed4a 100644
--- a/scaffold/tests/7f-struct-pointer-arithmetic.c
+++ b/scaffold/tests/7f-struct-pointer-arithmetic.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 
 #include <libmes.h>
 #include <stdio.h>
@@ -34,7 +34,7 @@ struct foo {
 struct foo g_foo[2];
 
 int
-test ()
+main ()
 {
   struct foo foo;
   foo.foo = g_foo;
diff --git a/scaffold/tests/7g-struct-byte-word-field.c b/scaffold/tests/7g-struct-byte-word-field.c
index 76f5d553..de854e40 100644
--- a/scaffold/tests/7g-struct-byte-word-field.c
+++ b/scaffold/tests/7g-struct-byte-word-field.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 
 #include <inttypes.h>
 #include <string.h>
@@ -31,7 +31,7 @@ struct option {
 };
 
 int
-test ()
+main ()
 {
   struct option h = {"help", 0, 10, 1};
   struct option o = {"output", 1, 11, 1};
diff --git a/scaffold/tests/7h-struct-assign.c b/scaffold/tests/7h-struct-assign.c
index 2959712d..5cb51db4 100644
--- a/scaffold/tests/7h-struct-assign.c
+++ b/scaffold/tests/7h-struct-assign.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <string.h>
 
 struct string {
@@ -43,7 +43,7 @@ struct string g_t;
 struct biggie tab[2];
 
 int
-test ()
+main ()
 {
   struct string s = {"hallo"};
   s.len = strlen (s.str);
diff --git a/scaffold/tests/7i-struct-struct.c b/scaffold/tests/7i-struct-struct.c
index 209468ca..bad030b2 100644
--- a/scaffold/tests/7i-struct-struct.c
+++ b/scaffold/tests/7i-struct-struct.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 
 struct s
@@ -42,7 +42,7 @@ struct anon
 
 
 int
-test ()
+main ()
 {
   struct foo f = {1,2};
   f.s.baz = 2; // FIXME
diff --git a/scaffold/tests/7j-strtoull.c b/scaffold/tests/7j-strtoull.c
index 511d56de..b500cb0f 100644
--- a/scaffold/tests/7j-strtoull.c
+++ b/scaffold/tests/7j-strtoull.c
@@ -18,14 +18,14 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <libmes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 int
-test ()
+main ()
 {
   char *p = "42foo\n";
   int n = abtoi (&p, 0);
diff --git a/scaffold/tests/7k-for-each-elem.c b/scaffold/tests/7k-for-each-elem.c
index 1f652fb4..65b9ebf5 100644
--- a/scaffold/tests/7k-for-each-elem.c
+++ b/scaffold/tests/7k-for-each-elem.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 
 struct section {
   unsigned char *data;
@@ -44,7 +44,7 @@ struct section section;
   for (;elem < ((type *) (sec->data + sec->offset)); elem++)
 
 int
-test ()
+main ()
 {
   struct sym* p;
   p = tab3;
diff --git a/scaffold/tests/7l-struct-any-size-array.c b/scaffold/tests/7l-struct-any-size-array.c
index 6e1d179c..ac7d95c2 100644
--- a/scaffold/tests/7l-struct-any-size-array.c
+++ b/scaffold/tests/7l-struct-any-size-array.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 
 #if __MESC__
 #define  __attribute__(x)
@@ -46,7 +46,7 @@ struct foo13 tab14[3];
 struct foo16 tab16[3];
 
 int
-test ()
+main ()
 {
   unsigned char *p;
 
diff --git a/scaffold/tests/7m-struct-char-array-assign.c b/scaffold/tests/7m-struct-char-array-assign.c
index ccbea55d..f7865179 100644
--- a/scaffold/tests/7m-struct-char-array-assign.c
+++ b/scaffold/tests/7m-struct-char-array-assign.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 
 struct file {
   char *ptr;
@@ -26,7 +26,7 @@ struct file {
 };
 
 int
-test ()
+main ()
 {
   struct file f;
   f.ptr = f.buffer;
diff --git a/scaffold/tests/7n-struct-struct-array.c b/scaffold/tests/7n-struct-struct-array.c
index 6307e484..b56751cf 100644
--- a/scaffold/tests/7n-struct-struct-array.c
+++ b/scaffold/tests/7n-struct-struct-array.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 
 #include <libmes.h>
 #include <stdlib.h>
@@ -39,7 +39,7 @@ struct state {
 };
 
 int
-test ()
+main ()
 {
   struct state s;
   struct state *ps;
diff --git a/scaffold/tests/80-setjmp.c b/scaffold/tests/80-setjmp.c
index 18d885de..83595011 100644
--- a/scaffold/tests/80-setjmp.c
+++ b/scaffold/tests/80-setjmp.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -44,7 +44,7 @@ first ()
 }
 
 int
-test ()
+main ()
 {
   if (!setjmp (buf))
     first ();               // when executed, setjmp returned 0
diff --git a/scaffold/tests/81-qsort.c b/scaffold/tests/81-qsort.c
index aca9ddfc..000e6135 100644
--- a/scaffold/tests/81-qsort.c
+++ b/scaffold/tests/81-qsort.c
@@ -18,7 +18,7 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <string.h>
 
 
@@ -31,7 +31,7 @@ compare_int (void *a, void *b)
 }
 
 int
-test ()
+main ()
 {
   int lst[6] = {0, 5, 4, 3, 2, -1};
   qsort (lst, 6, sizeof (int), compare_int);
diff --git a/scaffold/tests/86-strncpy.c b/scaffold/tests/86-strncpy.c
index f1cfdb3d..ccccecf5 100644
--- a/scaffold/tests/86-strncpy.c
+++ b/scaffold/tests/86-strncpy.c
@@ -18,12 +18,12 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 #include <string.h>
 
 int
-test ()
+main ()
 {
   puts ("\n");
   char buf[10] = {0,0,0,0,0,0,0,0,0,0};
diff --git a/scaffold/tests/87-sscanf.c b/scaffold/tests/87-sscanf.c
index ce86baf7..09aee7c8 100644
--- a/scaffold/tests/87-sscanf.c
+++ b/scaffold/tests/87-sscanf.c
@@ -18,11 +18,11 @@
  * along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "30-test.i"
+#include <libmes.h>
 #include <stdio.h>
 
 int
-test ()
+main ()
 {
   int i;
   int r = sscanf ("42", "%d", &i);