diff --git a/psys/include/p2c/newci.h b/psys/include/p2c/newci.h
index 9f672237a0538262b405f79f2cc7f1f5c692aea5..d8e69aed604dd1a6d840a70fa01be942e05c798d 100644
--- a/psys/include/p2c/newci.h
+++ b/psys/include/p2c/newci.h
@@ -23,43 +23,41 @@
 typedef char *newci_argarr[100001L];
 
 typedef struct newci_parserec {
-    char switch_[4];
-    uchar used;
-    char kind;
-    union {
-	long i;
-	double r;
-	char *s;
-	_PROCEDURE p;
-	_PROCEDURE p1;
-    } UU;
+	char switch_[4];
+	uchar used;
+	char kind;
+	union {
+		long i;
+		double r;
+		char *s;
+		_PROCEDURE p;
+		_PROCEDURE p1;
+	} UU;
 } newci_parserec;
 
 typedef newci_parserec newci_parsetab[1000000L];
 
 typedef struct newci_fshandle {
-    long a, b;
+	long a;
+	long b;
 } newci_fshandle;
 
 typedef enum {
-    im_normal, im_keep, im_default, im_key, im_grab
+	im_normal, im_keep, im_default, im_key, im_grab
 } newci_imode;
 
 typedef struct timers_desc {
-    long rate;
-    _PROCEDURE proc;
-    long count;
-    int perm;
-    struct timers_desc *next;
-    void* *user;
+	long rate;
+	_PROCEDURE proc;
+	long count;
+	int perm;
+	struct timers_desc *next;
+	void **user;
 } timers_desc;
 
-
-
 #define newci_exitescapecode 18346
 
 
-
 vextern _PROCEDURE newci_progentryhook;
 vextern _PROCEDURE newci_progexithook;
 extern int P_argc;
@@ -80,94 +78,93 @@ vextern FILE **newci_stdterm;
 
 
 
-extern FILE **newci_stdin ();
-extern FILE **newci_stdout ();
-extern FILE **newci_stderr ();
-extern void newci_parseargs (char *s);
+//extern FILE **newci_stdin ();
+//extern FILE **newci_stdout ();
+//extern FILE **newci_stderr ();
+//extern void newci_parseargs (char *s);
 extern void newci_parseswitch (newci_parserec *tab, long size, char *bad);
 extern void newci_eatargument ();
 extern void newci_fixfname (char *s, char *ext, char *home);
 extern void newci_forcefname (char *s, char *ext, char *home);
-extern void newci_chainprogram (char *name);
+//extern void newci_chainprogram (char *name);
 extern void newci_markprogram (long *id);
 extern void newci_loadprogram (char *name);
-extern void newci_reloadprogram (char *name);
+//extern void newci_reloadprogram (char *name);
 extern void newci_releaseprogram (long *id);
-extern void newci_runprogram (char *name);
-extern void newci_shellrunprogram (char *name, int debugging);
-extern void newci_basicrunprogram (char *name, int debugging);
+//extern void newci_runprogram (char *name);
+//extern void newci_shellrunprogram (char *name, int debugging);
+//extern void newci_basicrunprogram (char *name, int debugging);
 extern void newci_shellescape (char *args);
 extern void newci_fullshellescape (char *args, char *opts);
 extern void newci_fulleditescape (char *fn, char *opts, long ln, long pos);
-extern void newci_permanentprogram ();
-extern void newci_unpermanentprogram ();
-extern void newci_recursiveprogram ();
-extern void newci_flushexecutionbits ();
-extern void newci_getenv (char *variable, char *value, int *exists);
-extern int newci_canreleaseprogram (long id);
-extern void newci_exit (long code);
-extern void newci_assert (int flag, char *msg);
-extern void newci_ferror (char *msg);
-extern void newci_merror (char *s, char *msg);
-extern char *newci_showerror (char *newci_Result, char *msg);
-extern void newci_fescape (long esc, long ior, char *msg);
-extern void newci_mescape (char *s, long esc, long ior, char *msg);
-extern char *newci_showescape (char *newci_Result, long esc, long ior,
-				  char *msg);
+//extern void newci_permanentprogram ();
+//extern void newci_unpermanentprogram ();
+//extern void newci_recursiveprogram ();
+//extern void newci_flushexecutionbits ();
+//extern void newci_getenv (char *variable, char *value, int *exists);
+//extern int newci_canreleaseprogram (long id);
+//extern void newci_exit (long code);
+//extern void newci_assert (int flag, char *msg);
+//extern void newci_ferror (char *msg);
+//extern void newci_merror (char *s, char *msg);
+//extern char *newci_showerror (char *newci_Result, char *msg);
+//extern void newci_fescape (long esc, long ior, char *msg);
+//extern void newci_mescape (char *s, long esc, long ior, char *msg);
+//extern char *newci_showescape (char *newci_Result, long esc, long ior,
+//				  char *msg);
 extern void newci_nullrecover ();
-extern void newci_reescape ();
-extern void newci_checkior ();
-extern void newci_iorecover ();
-extern void* *newci_findsymbol (char *name);
-extern void newci_fixfname (char *s, char * ext, char * home);
+//extern void newci_reescape ();
+//extern void newci_checkior ();
+//extern void newci_iorecover ();
+//extern void* *newci_findsymbol (char *name);
 
 
 /*case sensitive*/
-extern void newci_initfindsymbol2 (newci_fshandle *handle);
-extern void* *newci_findsymbol2 (char *suffix, newci_fshandle *handle,
-				     char *name);
-extern int newci_findprogram (char *name);
-extern int newci_findprocedure (char *name, _PROCEDURE *start);
-extern int newci_findprocedure2 (char *name, _PROCEDURE *start);
-extern void* *newci_findglobal (char *name, long offset);
-extern void newci_findabove (long *addr, char *name);
-extern void newci_findbelow (long *addr, char *name);
-extern void push_var (long *v);
+//extern void newci_initfindsymbol2 (newci_fshandle *handle);
+//extern void* *newci_findsymbol2 (char *suffix, newci_fshandle *handle,
+//				     char *name);
+//extern int newci_findprogram (char *name);
+//extern int newci_findprocedure (char *name, _PROCEDURE *start);
+//extern int newci_findprocedure2 (char *name, _PROCEDURE *start);
+//extern void* *newci_findglobal (char *name, long offset);
+//extern void newci_findabove (long *addr, char *name);
+//extern void newci_findbelow (long *addr, char *name);
+//extern void push_var (long *v);
 
 /*also records, arrays*/
-extern void push_varstr (char *s);
-extern void push_boolean (int b);
-extern void push_char (int c);
-extern void push_shortint (long i);
+//extern void push_varstr (char *s);
+//extern void push_boolean (int b);
+//extern void push_char (int c);
+//extern void push_shortint (long i);
 
 /*also enumerated types, with ord()*/
-extern void push_ptr (void* *p);
-extern void push_integer (long i);
-extern void push_real (double r);
-extern void push_string (char *s);
-extern void newci_callfunction (_PROCEDURE start, long *ret, long retsize);
-extern int newci_callboolean (_PROCEDURE start);
-extern void newci_inputbegin ();
+//extern void push_ptr (void* *p);
+//extern void push_integer (long i);
+//extern void push_real (double r);
+//extern void push_string (char *s);
+//extern void newci_callfunction (_PROCEDURE start, long *ret, long retsize);
+//extern int newci_callboolean (_PROCEDURE start);
+//extern void newci_inputbegin ();
 extern void newci_inputmap ();
-extern void newci_inputunmap ();
-extern void newci_inputstring (char *s, int mode, char *possterm,
-				  char *term, int echoterm, long *pos);
-extern void newci_addrecallstr (char *s);
-extern void interrupt_input (int ch);
-extern void newci_streamopen (char *sfile, int report);
-extern void newci_streamclose ();
-extern void check_respond ();
-extern void timers_add (timers_desc *t);
-extern void timers_addperm (timers_desc *t);
-extern void timers_remove (timers_desc *t);
+//extern void newci_inputunmap ();
+//extern void newci_inputstring (char *s, int mode, char *possterm,
+//				  char *term, int echoterm, long *pos);
+//extern void newci_addrecallstr (char *s);
+//extern void interrupt_input (int ch);
+//extern void newci_streamopen (char *sfile, int report);
+//extern void newci_streamclose ();
+//extern void check_respond ();
+//extern void timers_add (timers_desc *t);
+//extern void timers_addperm (timers_desc *t);
+//extern void timers_remove (timers_desc *t);
 extern long timers_sysclock ();
-extern void timers_refreshclock ();
-extern void timers_clockon ();
-extern void timers_clockoff ();
-extern void timers_setalarm (long hour, long min);
+//extern void timers_refreshclock ();
+//extern void timers_clockon ();
+//extern void timers_clockoff ();
+//extern void timers_setalarm (long hour, long min);
 extern long newci_fullseconds ();
-extern void newci_fulltime (long *sec, long *csec);
-extern long newci_dayofweek ();
+//extern void newci_fulltime (long *sec, long *csec);
+//extern long newci_dayofweek ();
 
 
 #undef vextern