Add changes from missed in last commit

c/algo_color.c

@@ -12,26 +12,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "dtypes.h"
+#include "scheme.h"
-#include "utils.h"
-#include "utf8.h"
-#include "ios.h"
-#include "socket.h"
-#include "timefuncs.h"
-#include "hashing.h"
-#include "htable.h"
-#include "htableh_inc.h"
-#include "bitvector.h"
-#include "os.h"
-#include "random.h"
-#include "llt.h"
-
-#include "flisp.h"
-
-#include "error.h"
-
-#include "argcount.h"
-#include "builtins.h"
 
 static char color_name_table[] =
 

c/argcount.c

@@ -0,0 +1,24 @@
+#include <sys/types.h>
+
+#include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+#include <limits.h>
+#include <locale.h>
+#include <math.h>
+#include <setjmp.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wctype.h>
+
+#include "scheme.h"
+
+void argcount(const char *fname, uint32_t nargs, uint32_t c)
+{
+    if (__unlikely(nargs != c))
+        lerrorf(ArgError, "%s: too %s arguments", fname,
+                nargs < c ? "few" : "many");
+}

c/scheme.h

@@ -0,0 +1,25 @@
+#include "dtypes.h"
+#include "utils.h"
+#include "utf8.h"
+#include "ios.h"
+#include "socket.h"
+#include "timefuncs.h"
+#include "hashing.h"
+#include "htable.h"
+#include "bitvector.h"
+#include "os.h"
+#include "random.h"
+#include "llt.h"
+#include "ieee754.h"
+#include "flisp.h"
+#include "error.h"
+#include "buf.h"
+#include "argcount.h"
+#include "env.h"
+#include "opcodes.h"
+#include "htableh_inc.h"
+#include "libraries.h"
+#include "os.h"
+#include "builtins.h"
+#include "libraries.h"
+#include "stringfuncs.h"