--- a/test/call_suite/globals.h	Mon Jan 17 10:25:33 2022 +0100
+++ b/test/call_suite/globals.h	Mon Jan 17 11:36:09 2022 +0100
@@ -24,15 +24,14 @@
 */
 
 
-#define DEF_TYPES X(c,char,'c') X(s,short,'s') X(i,int,'i') X(j,long,'j') X(l,long long,'l') X(p,void*,'p') X(f,float,'f') X(d,double,'d')
+#define DEF_TYPES X(c,char) X(s,short) X(i,int) X(j,long) X(l,long long) X(p,void*) X(f,float) X(d,double)
 
-#define X(CH,T,QCH) extern T *K_##CH; extern T *V_##CH;
+#define X(CH,T) extern T *K_##CH; extern T *V_##CH;
 DEF_TYPES
 #undef X
 
 typedef void (*funptr)();
 
-extern void       * G_callvm;
 extern funptr       G_funtab[];
 extern char const * G_sigtab[];
 extern int          G_ncases;
@@ -41,25 +40,4 @@
 void init_K();
 void init_T();
 void clear_V();
-int  invoke(char const* signature, void* target);
 
-#if 0
-extern const char      *K_c;
-extern const short     *K_s;
-extern const int       *K_i;
-extern const long      *K_j;
-extern const long long *K_l;
-extern void* const     *K_p;
-extern const float     *K_f;
-extern const double    *K_d;
-
-extern char      *V_c;
-extern short     *V_s;
-extern int       *V_i;
-extern long      *V_j;
-extern long long *V_l;
-extern void*     *V_p;
-extern float     *V_f;
-extern double    *V_d;
-#endif 
-