diff --git a/scaffold/argv.c b/scaffold/argv.c
index fe47f97d..6e64f0ca 100644
--- a/scaffold/argv.c
+++ b/scaffold/argv.c
@@ -18,7 +18,8 @@
  * along with Mes.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
+#include <libmes.h>
+#include <string.h>
 
 int
 main (int argc, char *argv[])
@@ -27,7 +28,7 @@ main (int argc, char *argv[])
 #if __MESC_MES__
   eputs ("MESC.MES\n");
 #else
-  puts ("MESC.GUILE\n");
+  eputs ("MESC.GUILE\n");
 #endif
   if (argc > 1 && !strcmp (argv[1], "--help"))
     {
diff --git a/scaffold/malloc.c b/scaffold/malloc.c
index 2c71e9a8..ad31867d 100644
--- a/scaffold/malloc.c
+++ b/scaffold/malloc.c
@@ -23,6 +23,8 @@
 #endif
 
 #include <libmes.h>
+#include <stdio.h>
+#include <stdlib.h>
 
 int
 main (int argc, char *argv[])
diff --git a/scaffold/micro-mes.c b/scaffold/micro-mes.c
index 2b3f9f4b..fd04c52c 100644
--- a/scaffold/micro-mes.c
+++ b/scaffold/micro-mes.c
@@ -23,6 +23,7 @@
 #endif
 
 #include <stdio.h>
+#include <stdlib.h>
 
 typedef int SCM;
 
diff --git a/scaffold/mini-mes.c b/scaffold/mini-mes.c
index 58df2d72..59508bdb 100644
--- a/scaffold/mini-mes.c
+++ b/scaffold/mini-mes.c
@@ -24,11 +24,13 @@
 #error "POSIX not supported"
 #endif
 
+#include <libmes.h>
+
 #include <stdio.h>
 #include <assert.h>
+#include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
-#include <libmes.h>
 
 int ARENA_SIZE = 200000; // 32b: 2MiB, 64b: 4 MiB
 int MAX_ARENA_SIZE = 300000000;
@@ -214,6 +216,8 @@ int g_function = 0;
 #endif
 #include "mes.mes.h"
 
+SCM gc_init_news ();
+
 // #if !MES_MINI
 // #include "posix.mes.h"
 // #ndif
@@ -893,7 +897,7 @@ bload_env (SCM a) ///((internal))
 {
   char *mo = "module/mes/read-0-32.mo";
   g_stdin = open (mo, 0);
-  if (g_stdin < 0) {eputs ("no such file: ");eputs (mo);eputs ("\n");return 1;} 
+  if (g_stdin < 0) {eputs ("no such file: ");eputs (mo);eputs ("\n");return 1;}
   assert (getchar () == 'M');
   assert (getchar () == 'E');
   assert (getchar () == 'S');
diff --git a/scaffold/tiny-mes.c b/scaffold/tiny-mes.c
index f21a728a..dfe8b81a 100644
--- a/scaffold/tiny-mes.c
+++ b/scaffold/tiny-mes.c
@@ -22,9 +22,12 @@
 #error "POSIX not supported"
 #endif
 
-#include <stdio.h>
 #include <libmes.h>
 
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 char arena[300];
 
 typedef int SCM;