diff --git a/cstdlib/ctype.c b/cstdlib/ctype.c
index 4c6932c..4c40373 100644
--- a/cstdlib/ctype.c
+++ b/cstdlib/ctype.c
@@ -103,22 +103,22 @@ void StdToascii(struct ParseState *Parser, struct Value *ReturnValue,
 /* all string.h functions */
 struct LibraryFunction StdCtypeFunctions[] =
 {
-    {StdIsalnum,    "int isalnum(int);"},
-    {StdIsalpha,    "int isalpha(int);"},
-    {StdIsblank,    "int isblank(int);"},
-    {StdIscntrl,    "int iscntrl(int);"},
-    {StdIsdigit,    "int isdigit(int);"},
-    {StdIsgraph,    "int isgraph(int);"},
-    {StdIslower,    "int islower(int);"},
-    {StdIsprint,    "int isprint(int);"},
-    {StdIspunct,    "int ispunct(int);"},
-    {StdIsspace,    "int isspace(int);"},
-    {StdIsupper,    "int isupper(int);"},
-    {StdIsxdigit,   "int isxdigit(int);"},
-    {StdTolower,    "int tolower(int);"},
-    {StdToupper,    "int toupper(int);"},
-    {StdIsascii,    "int isascii(int);"},
-    {StdToascii,    "int toascii(int);"},
-    {NULL,          NULL }
+    {StdIsalnum, "int isalnum(int);"},
+    {StdIsalpha, "int isalpha(int);"},
+    {StdIsblank, "int isblank(int);"},
+    {StdIscntrl, "int iscntrl(int);"},
+    {StdIsdigit, "int isdigit(int);"},
+    {StdIsgraph, "int isgraph(int);"},
+    {StdIslower, "int islower(int);"},
+    {StdIsprint, "int isprint(int);"},
+    {StdIspunct, "int ispunct(int);"},
+    {StdIsspace, "int isspace(int);"},
+    {StdIsupper, "int isupper(int);"},
+    {StdIsxdigit, "int isxdigit(int);"},
+    {StdTolower, "int tolower(int);"},
+    {StdToupper, "int toupper(int);"},
+    {StdIsascii, "int isascii(int);"},
+    {StdToascii, "int toascii(int);"},
+    {NULL, NULL }
 };
 
diff --git a/cstdlib/math.c b/cstdlib/math.c
index d166e18..0738596 100644
--- a/cstdlib/math.c
+++ b/cstdlib/math.c
@@ -2,18 +2,18 @@
 #include "../interpreter.h"
 
 
-static double M_EValue =        2.7182818284590452354;   /* e */
-static double M_LOG2EValue =    1.4426950408889634074;   /* log_2 e */
-static double M_LOG10EValue =   0.43429448190325182765;  /* log_10 e */
-static double M_LN2Value =      0.69314718055994530942;  /* log_e 2 */
-static double M_LN10Value =     2.30258509299404568402;  /* log_e 10 */
-static double M_PIValue =       3.14159265358979323846;  /* pi */
-static double M_PI_2Value =     1.57079632679489661923;  /* pi/2 */
-static double M_PI_4Value =     0.78539816339744830962;  /* pi/4 */
-static double M_1_PIValue =     0.31830988618379067154;  /* 1/pi */
-static double M_2_PIValue =     0.63661977236758134308;  /* 2/pi */
+static double M_EValue = 2.7182818284590452354;   /* e */
+static double M_LOG2EValue = 1.4426950408889634074;   /* log_2 e */
+static double M_LOG10EValue = 0.43429448190325182765;  /* log_10 e */
+static double M_LN2Value = 0.69314718055994530942;  /* log_e 2 */
+static double M_LN10Value = 2.30258509299404568402;  /* log_e 10 */
+static double M_PIValue = 3.14159265358979323846;  /* pi */
+static double M_PI_2Value = 1.57079632679489661923;  /* pi/2 */
+static double M_PI_4Value = 0.78539816339744830962;  /* pi/4 */
+static double M_1_PIValue = 0.31830988618379067154;  /* 1/pi */
+static double M_2_PIValue = 0.63661977236758134308;  /* 2/pi */
 static double M_2_SQRTPIValue = 1.12837916709551257390;  /* 2/sqrt(pi) */
-static double M_SQRT2Value =    1.41421356237309504880;  /* sqrt(2) */
+static double M_SQRT2Value = 1.41421356237309504880;  /* sqrt(2) */
 static double M_SQRT1_2Value =  0.70710678118654752440;  /* 1/sqrt(2) */
 
 
@@ -160,30 +160,30 @@ void MathFloor(struct ParseState *Parser, struct Value *ReturnValue,
 /* all math.h functions */
 struct LibraryFunction MathFunctions[] =
 {
-     {MathAcos,  "float acos(float);"},
-     {MathAsin,  "float asin(float);"},
-     {MathAtan,  "float atan(float);"},
+     {MathAcos, "float acos(float);"},
+     {MathAsin, "float asin(float);"},
+     {MathAtan, "float atan(float);"},
      {MathAtan2, "float atan2(float, float);"},
-     {MathCeil,  "float ceil(float);"},
-     {MathCos,   "float cos(float);"},
-     {MathCosh,  "float cosh(float);"},
-     {MathExp,   "float exp(float);"},
-     {MathFabs,  "float fabs(float);"},
+     {MathCeil, "float ceil(float);"},
+     {MathCos, "float cos(float);"},
+     {MathCosh, "float cosh(float);"},
+     {MathExp, "float exp(float);"},
+     {MathFabs, "float fabs(float);"},
      {MathFloor, "float floor(float);"},
-     {MathFmod,  "float fmod(float, float);"},
+     {MathFmod, "float fmod(float, float);"},
      {MathFrexp, "float frexp(float, int *);"},
      {MathLdexp, "float ldexp(float, int);"},
-     {MathLog,   "float log(float);"},
+     {MathLog, "float log(float);"},
      {MathLog10, "float log10(float);"},
-     {MathModf,  "float modf(float, float *);"},
-     {MathPow,   "float pow(float,float);"},
+     {MathModf, "float modf(float, float *);"},
+     {MathPow, "float pow(float,float);"},
      {MathRound, "float round(float);"},
-     {MathSin,   "float sin(float);"},
-     {MathSinh,  "float sinh(float);"},
-     {MathSqrt,  "float sqrt(float);"},
-     {MathTan,   "float tan(float);"},
-     {MathTanh,  "float tanh(float);"},
-     {NULL,      NULL }
+     {MathSin, "float sin(float);"},
+     {MathSinh, "float sinh(float);"},
+     {MathSqrt, "float sqrt(float);"},
+     {MathTan,  "float tan(float);"},
+     {MathTanh, "float tanh(float);"},
+     {NULL,  NULL }
 };
 
 /* creates various system-dependent definitions */
diff --git a/cstdlib/stdio.c b/cstdlib/stdio.c
index 179361a..87bf4d3 100644
--- a/cstdlib/stdio.c
+++ b/cstdlib/stdio.c
@@ -724,54 +724,54 @@ typedef struct __FILEStruct FILE;\
 /* all stdio functions */
 struct LibraryFunction StdioFunctions[] =
 {
-    {StdioFopen,   "FILE *fopen(char *, char *);"},
+    {StdioFopen, "FILE *fopen(char *, char *);"},
     {StdioFreopen, "FILE *freopen(char *, char *, FILE *);"},
-    {StdioFclose,  "int fclose(FILE *);"},
-    {StdioFread,   "int fread(void *, int, int, FILE *);"},
-    {StdioFwrite,  "int fwrite(void *, int, int, FILE *);"},
-    {StdioFgetc,   "int fgetc(FILE *);"},
-    {StdioFgetc,   "int getc(FILE *);"},
-    {StdioFgets,   "char *fgets(char *, int, FILE *);"},
-    {StdioFputc,   "int fputc(int, FILE *);"},
-    {StdioFputs,   "int fputs(char *, FILE *);"},
-    {StdioRemove,  "int remove(char *);"},
-    {StdioRename,  "int rename(char *, char *);"},
-    {StdioRewind,  "void rewind(FILE *);"},
+    {StdioFclose, "int fclose(FILE *);"},
+    {StdioFread, "int fread(void *, int, int, FILE *);"},
+    {StdioFwrite, "int fwrite(void *, int, int, FILE *);"},
+    {StdioFgetc, "int fgetc(FILE *);"},
+    {StdioFgetc, "int getc(FILE *);"},
+    {StdioFgets, "char *fgets(char *, int, FILE *);"},
+    {StdioFputc, "int fputc(int, FILE *);"},
+    {StdioFputs, "int fputs(char *, FILE *);"},
+    {StdioRemove, "int remove(char *);"},
+    {StdioRename, "int rename(char *, char *);"},
+    {StdioRewind, "void rewind(FILE *);"},
     {StdioTmpfile, "FILE *tmpfile();"},
     {StdioClearerr,"void clearerr(FILE *);"},
-    {StdioFeof,    "int feof(FILE *);"},
-    {StdioFerror,  "int ferror(FILE *);"},
-    {StdioFileno,  "int fileno(FILE *);"},
-    {StdioFflush,  "int fflush(FILE *);"},
+    {StdioFeof, "int feof(FILE *);"},
+    {StdioFerror, "int ferror(FILE *);"},
+    {StdioFileno, "int fileno(FILE *);"},
+    {StdioFflush, "int fflush(FILE *);"},
     {StdioFgetpos, "int fgetpos(FILE *, int *);"},
     {StdioFsetpos, "int fsetpos(FILE *, int *);"},
-    {StdioFtell,   "int ftell(FILE *);"},
-    {StdioFseek,   "int fseek(FILE *, int, int);"},
-    {StdioPerror,  "void perror(char *);"},
-    {StdioPutc,    "int putc(char *, FILE *);"},
+    {StdioFtell, "int ftell(FILE *);"},
+    {StdioFseek, "int fseek(FILE *, int, int);"},
+    {StdioPerror, "void perror(char *);"},
+    {StdioPutc, "int putc(char *, FILE *);"},
     {StdioPutchar, "int putchar(int);"},
     {StdioPutchar, "int fputchar(int);"},
-    {StdioSetbuf,  "void setbuf(FILE *, char *);"},
+    {StdioSetbuf, "void setbuf(FILE *, char *);"},
     {StdioSetvbuf, "void setvbuf(FILE *, char *, int, int);"},
-    {StdioUngetc,  "int ungetc(int, FILE *);"},
-    {StdioPuts,    "int puts(char *);"},
-    {StdioGets,    "char *gets(char *);"},
+    {StdioUngetc, "int ungetc(int, FILE *);"},
+    {StdioPuts, "int puts(char *);"},
+    {StdioGets, "char *gets(char *);"},
     {StdioGetchar, "int getchar();"},
-    {StdioPrintf,  "int printf(char *, ...);"},
+    {StdioPrintf, "int printf(char *, ...);"},
     {StdioFprintf, "int fprintf(FILE *, char *, ...);"},
     {StdioSprintf, "int sprintf(char *, char *, ...);"},
     {StdioSnprintf,"int snprintf(char *, int, char *, ...);"},
-    {StdioScanf,   "int scanf(char *, ...);"},
-    {StdioFscanf,  "int fscanf(FILE *, char *, ...);"},
-    {StdioSscanf,  "int sscanf(char *, char *, ...);"},
+    {StdioScanf, "int scanf(char *, ...);"},
+    {StdioFscanf, "int fscanf(FILE *, char *, ...);"},
+    {StdioSscanf, "int sscanf(char *, char *, ...);"},
     {StdioVprintf, "int vprintf(char *, va_list);"},
     {StdioVfprintf,"int vfprintf(FILE *, char *, va_list);"},
     {StdioVsprintf,"int vsprintf(char *, char *, va_list);"},
     {StdioVsnprintf,"int vsnprintf(char *, int, char *, va_list);"},
-    {StdioVscanf,   "int vscanf(char *, va_list);"},
-    {StdioVfscanf,  "int vfscanf(FILE *, char *, va_list);"},
-    {StdioVsscanf,  "int vsscanf(char *, char *, va_list);"},
-    {NULL,         NULL}
+    {StdioVscanf, "int vscanf(char *, va_list);"},
+    {StdioVfscanf, "int vfscanf(FILE *, char *, va_list);"},
+    {StdioVsscanf, "int vsscanf(char *, char *, va_list);"},
+    {NULL, NULL}
 };
 
 /* creates various system-dependent definitions */
diff --git a/cstdlib/stdlib.c b/cstdlib/stdlib.c
index d8d22e3..44200de 100644
--- a/cstdlib/stdlib.c
+++ b/cstdlib/stdlib.c
@@ -159,31 +159,31 @@ typedef struct { \
 /* all stdlib.h functions */
 struct LibraryFunction StdlibFunctions[] =
 {
-    {StdlibAtof,    "float atof(char *);"},
-    {StdlibStrtod,  "float strtod(char *,char **);"},
-    {StdlibAtoi,    "int atoi(char *);"},
-    {StdlibAtol,    "int atol(char *);"},
-    {StdlibStrtol,  "int strtol(char *,char **,int);"},
+    {StdlibAtof, "float atof(char *);"},
+    {StdlibStrtod, "float strtod(char *,char **);"},
+    {StdlibAtoi, "int atoi(char *);"},
+    {StdlibAtol, "int atol(char *);"},
+    {StdlibStrtol, "int strtol(char *,char **,int);"},
     {StdlibStrtoul, "int strtoul(char *,char **,int);"},
-    {StdlibMalloc,  "void *malloc(int);"},
-    {StdlibCalloc,  "void *calloc(int,int);"},
+    {StdlibMalloc, "void *malloc(int);"},
+    {StdlibCalloc, "void *calloc(int,int);"},
     {StdlibRealloc, "void *realloc(void *,int);"},
-    {StdlibFree,    "void free(void *);"},
-    {StdlibRand,    "int rand();"},
-    {StdlibSrand,   "void srand(int);"},
-    {StdlibAbort,   "void abort();"},
-    {StdlibExit,    "void exit(int);"},
-    {StdlibGetenv,  "char *getenv(char *);"},
-    {StdlibSystem,  "int system(char *);"},
-/*    {StdlibBsearch,   "void *bsearch(void *,void *,int,int,int (*)());"}, */
+    {StdlibFree, "void free(void *);"},
+    {StdlibRand, "int rand();"},
+    {StdlibSrand, "void srand(int);"},
+    {StdlibAbort, "void abort();"},
+    {StdlibExit, "void exit(int);"},
+    {StdlibGetenv, "char *getenv(char *);"},
+    {StdlibSystem, "int system(char *);"},
+/*    {StdlibBsearch, "void *bsearch(void *,void *,int,int,int (*)());"}, */
 /*    {StdlibQsort, "void *qsort(void *,int,int,int (*)());"}, */
     {StdlibAbs, "int abs(int);"},
-    {StdlibLabs,    "int labs(int);"},
+    {StdlibLabs, "int labs(int);"},
 #if 0
-    {StdlibDiv,     "div_t div(int);"},
-    {StdlibLdiv,    "ldiv_t ldiv(int);"},
+    {StdlibDiv, "div_t div(int);"},
+    {StdlibLdiv, "ldiv_t ldiv(int);"},
 #endif
-    {NULL,          NULL}
+    {NULL, NULL}
 };
 
 /* creates various system-dependent definitions */
diff --git a/cstdlib/time.c b/cstdlib/time.c
index d4de1d4..a06ca9e 100644
--- a/cstdlib/time.c
+++ b/cstdlib/time.c
@@ -102,21 +102,21 @@ typedef int clock_t;\
 /* all string.h functions */
 struct LibraryFunction StdTimeFunctions[] =
 {
-    {StdAsctime,    "char *asctime(struct tm *);"},
-    {StdClock,      "time_t clock();"},
-    {StdCtime,      "char *ctime(int *);"},
-    {StdDifftime,   "double difftime(int, int);"},
-    {StdGmtime,     "struct tm *gmtime(int *);"},
-    {StdLocaltime,  "struct tm *localtime(int *);"},
-    {StdMktime,     "int mktime(struct tm *ptm);"},
-    {StdTime,       "int time(int *);"},
-    {StdStrftime,   "int strftime(char *, int, char *, struct tm *);"},
+    {StdAsctime, "char *asctime(struct tm *);"},
+    {StdClock, "time_t clock();"},
+    {StdCtime, "char *ctime(int *);"},
+    {StdDifftime, "double difftime(int, int);"},
+    {StdGmtime, "struct tm *gmtime(int *);"},
+    {StdLocaltime, "struct tm *localtime(int *);"},
+    {StdMktime, "int mktime(struct tm *ptm);"},
+    {StdTime, "int time(int *);"},
+    {StdStrftime, "int strftime(char *, int, char *, struct tm *);"},
 #ifndef WIN32
-    {StdStrptime,   "char *strptime(char *, char *, struct tm *);"},
-	{StdGmtime_r,   "struct tm *gmtime_r(int *, struct tm *);"},
-    {StdTimegm,     "int timegm(struct tm *);"},
+    {StdStrptime, "char *strptime(char *, char *, struct tm *);"},
+	{StdGmtime_r, "struct tm *gmtime_r(int *, struct tm *);"},
+    {StdTimegm, "int timegm(struct tm *);"},
 #endif
-    {NULL,          NULL}
+    {NULL, NULL}
 };
 
 
diff --git a/cstdlib/unistd.c b/cstdlib/unistd.c
index 3de9e31..2f129c6 100644
--- a/cstdlib/unistd.c
+++ b/cstdlib/unistd.c
@@ -496,91 +496,91 @@ typedef int intptr_t;\
 /* all unistd.h functions */
 struct LibraryFunction UnistdFunctions[] =
 {
-    {UnistdAccess,        "int access(char *, int);"},
-    {UnistdAlarm,         "unsigned int alarm(unsigned int);"},
-/*    {UnistdBrk,           "int brk(void *);"}, */
-    {UnistdChdir,         "int chdir(char *);"},
-    {UnistdChroot,        "int chroot(char *);"},
-    {UnistdChown,         "int chown(char *, uid_t, gid_t);"},
-    {UnistdClose,         "int close(int);"},
-    {UnistdConfstr,       "size_t confstr(int, char *, size_t);"},
-    {UnistdCtermid,       "char *ctermid(char *);"},
-/*    {UnistdCuserid,       "char *cuserid(char *);"}, */
-    {UnistdDup,           "int dup(int);"},
-    {UnistdDup2,          "int dup2(int, int);"},
-/*     {UnistdEncrypt,       "void encrypt(char[64], int);"}, */
-/*    {UnistdExecl,         "int execl(char *, char *, ...);"}, */
-/*    {UnistdExecle,        "int execle(char *, char *, ...);"}, */
-/*    {UnistdExeclp,        "int execlp(char *, char *, ...);"}, */
-/*    {UnistdExecv,         "int execv(char *, char *[]);"}, */
-/*    {UnistdExecve,        "int execve(char *, char *[], char *[]);"}, */
-/*    {UnistdExecvp,        "int execvp(char *, char *[]);"}, */
-    {Unistd_Exit,         "void _exit(int);"},
-    {UnistdFchown,        "int fchown(int, uid_t, gid_t);"},
-    {UnistdFchdir,        "int fchdir(int);"},
-    {UnistdFdatasync,     "int fdatasync(int);"},
-    {UnistdFork,          "pid_t fork(void);"},
-    {UnistdFpathconf,     "long fpathconf(int, int);"},
-    {UnistdFsync,         "int fsync(int);"},
-    {UnistdFtruncate,     "int ftruncate(int, off_t);"},
-    {UnistdGetcwd,        "char *getcwd(char *, size_t);"},
+    {UnistdAccess, "int access(char *, int);"},
+    {UnistdAlarm, "unsigned int alarm(unsigned int);"},
+/*    {UnistdBrk, "int brk(void *);"}, */
+    {UnistdChdir, "int chdir(char *);"},
+    {UnistdChroot, "int chroot(char *);"},
+    {UnistdChown, "int chown(char *, uid_t, gid_t);"},
+    {UnistdClose, "int close(int);"},
+    {UnistdConfstr, "size_t confstr(int, char *, size_t);"},
+    {UnistdCtermid, "char *ctermid(char *);"},
+/*    {UnistdCuserid, "char *cuserid(char *);"}, */
+    {UnistdDup, "int dup(int);"},
+    {UnistdDup2, "int dup2(int, int);"},
+/*     {UnistdEncrypt, "void encrypt(char[64], int);"}, */
+/*    {UnistdExecl, "int execl(char *, char *, ...);"}, */
+/*    {UnistdExecle, "int execle(char *, char *, ...);"}, */
+/*    {UnistdExeclp, "int execlp(char *, char *, ...);"}, */
+/*    {UnistdExecv, "int execv(char *, char *[]);"}, */
+/*    {UnistdExecve, "int execve(char *, char *[], char *[]);"}, */
+/*    {UnistdExecvp, "int execvp(char *, char *[]);"}, */
+    {Unistd_Exit, "void _exit(int);"},
+    {UnistdFchown, "int fchown(int, uid_t, gid_t);"},
+    {UnistdFchdir, "int fchdir(int);"},
+    {UnistdFdatasync, "int fdatasync(int);"},
+    {UnistdFork, "pid_t fork(void);"},
+    {UnistdFpathconf, "long fpathconf(int, int);"},
+    {UnistdFsync, "int fsync(int);"},
+    {UnistdFtruncate, "int ftruncate(int, off_t);"},
+    {UnistdGetcwd, "char *getcwd(char *, size_t);"},
     {UnistdGetdtablesize, "int getdtablesize(void);"},
-    {UnistdGetegid,       "gid_t getegid(void);"},
-    {UnistdGeteuid,       "uid_t geteuid(void);"},
-    {UnistdGetgid,        "gid_t getgid(void);"},
-/*    {UnistdGetgroups,     "int getgroups(int, gid_t []);"}, */
-    {UnistdGethostid,     "long gethostid(void);"},
-    {UnistdGetlogin,      "char *getlogin(void);"},
-    {UnistdGetlogin_r,    "int getlogin_r(char *, size_t);"},
-/*    {UnistdGetopt,        "int getopt(int, char * [], char *);"}, */
-    {UnistdGetpagesize,   "int getpagesize(void);"},
-    {UnistdGetpass,       "char *getpass(char *);"},
-/*    {UnistdGetpgid,       "pid_t getpgid(pid_t);"}, */
-    {UnistdGetpgrp,       "pid_t getpgrp(void);"},
-    {UnistdGetpid,        "pid_t getpid(void);"},
-    {UnistdGetppid,       "pid_t getppid(void);"},
-/*    {UnistdGetsid,        "pid_t getsid(pid_t);"}, */
-    {UnistdGetuid,        "uid_t getuid(void);"},
-    {UnistdGetwd,         "char *getwd(char *);"},
-    {UnistdIsatty,        "int isatty(int);"},
-    {UnistdLchown,        "int lchown(char *, uid_t, gid_t);"},
-    {UnistdLink,          "int link(char *, char *);"},
-    {UnistdLockf,         "int lockf(int, int, off_t);"},
-    {UnistdLseek,         "off_t lseek(int, off_t, int);"},
-    {UnistdNice,          "int nice(int);"},
-    {UnistdPathconf,      "long pathconf(char *, int);"},
-    {UnistdPause,         "int pause(void);"},
-/*    {UnistdPipe,          "int pipe(int [2]);"}, */
-/*    {UnistdPread,         "ssize_t pread(int, void *, size_t, off_t);"}, */
-/*    {UnistdPthread_atfork,"int pthread_atfork(void (*)(void), void (*)(void), void(*)(void));"}, */
-/*    {UnistdPwrite,        "ssize_t pwrite(int, void *, size_t, off_t);"}, */
-    {UnistdRead,          "ssize_t read(int, void *, size_t);"},
-    {UnistdReadlink,      "int readlink(char *, char *, size_t);"},
-    {UnistdRmdir,         "int rmdir(char *);"},
-    {UnistdSbrk,          "void *sbrk(intptr_t);"},
-    {UnistdSetgid,        "int setgid(gid_t);"},
-    {UnistdSetpgid,       "int setpgid(pid_t, pid_t);"},
-    {UnistdSetpgrp,       "pid_t setpgrp(void);"},
-    {UnistdSetregid,      "int setregid(gid_t, gid_t);"},
-    {UnistdSetreuid,      "int setreuid(uid_t, uid_t);"},
-    {UnistdSetsid,        "pid_t setsid(void);"},
-    {UnistdSetuid,        "int setuid(uid_t);"},
-    {UnistdSleep,         "unsigned int sleep(unsigned int);"},
-/*    {UnistdSwab,          "void swab(void *, void *, ssize_t);"}, */
-    {UnistdSymlink,       "int symlink(char *, char *);"},
-    {UnistdSync,          "void sync(void);"},
-    {UnistdSysconf,       "long sysconf(int);"},
-    {UnistdTcgetpgrp,     "pid_t tcgetpgrp(int);"},
-    {UnistdTcsetpgrp,     "int tcsetpgrp(int, pid_t);"},
-    {UnistdTruncate,      "int truncate(char *, off_t);"},
-    {UnistdTtyname,       "char *ttyname(int);"},
-    {UnistdTtyname_r,     "int ttyname_r(int, char *, size_t);"},
-    {UnistdUalarm,        "useconds_t ualarm(useconds_t, useconds_t);"},
-    {UnistdUnlink,        "int unlink(char *);"},
-    {UnistdUsleep,        "int usleep(useconds_t);"},
-    {UnistdVfork,         "pid_t vfork(void);"},
-    {UnistdWrite,         "ssize_t write(int, void *, size_t);"},
-    {NULL,                 NULL}
+    {UnistdGetegid, "gid_t getegid(void);"},
+    {UnistdGeteuid, "uid_t geteuid(void);"},
+    {UnistdGetgid, "gid_t getgid(void);"},
+/*    {UnistdGetgroups, "int getgroups(int, gid_t []);"}, */
+    {UnistdGethostid, "long gethostid(void);"},
+    {UnistdGetlogin, "char *getlogin(void);"},
+    {UnistdGetlogin_r, "int getlogin_r(char *, size_t);"},
+/*    {UnistdGetopt, "int getopt(int, char * [], char *);"}, */
+    {UnistdGetpagesize, "int getpagesize(void);"},
+    {UnistdGetpass, "char *getpass(char *);"},
+/*    {UnistdGetpgid, "pid_t getpgid(pid_t);"}, */
+    {UnistdGetpgrp, "pid_t getpgrp(void);"},
+    {UnistdGetpid, "pid_t getpid(void);"},
+    {UnistdGetppid, "pid_t getppid(void);"},
+/*    {UnistdGetsid, "pid_t getsid(pid_t);"}, */
+    {UnistdGetuid, "uid_t getuid(void);"},
+    {UnistdGetwd, "char *getwd(char *);"},
+    {UnistdIsatty, "int isatty(int);"},
+    {UnistdLchown, "int lchown(char *, uid_t, gid_t);"},
+    {UnistdLink, "int link(char *, char *);"},
+    {UnistdLockf, "int lockf(int, int, off_t);"},
+    {UnistdLseek, "off_t lseek(int, off_t, int);"},
+    {UnistdNice, "int nice(int);"},
+    {UnistdPathconf, "long pathconf(char *, int);"},
+    {UnistdPause, "int pause(void);"},
+/*    {UnistdPipe, "int pipe(int [2]);"}, */
+/*    {UnistdPread, "ssize_t pread(int, void *, size_t, off_t);"}, */
+/*    {UnistdPthread_atfork, "int pthread_atfork(void (*)(void), void (*)(void), void(*)(void));"}, */
+/*    {UnistdPwrite, "ssize_t pwrite(int, void *, size_t, off_t);"}, */
+    {UnistdRead, "ssize_t read(int, void *, size_t);"},
+    {UnistdReadlink, "int readlink(char *, char *, size_t);"},
+    {UnistdRmdir, "int rmdir(char *);"},
+    {UnistdSbrk, "void *sbrk(intptr_t);"},
+    {UnistdSetgid, "int setgid(gid_t);"},
+    {UnistdSetpgid, "int setpgid(pid_t, pid_t);"},
+    {UnistdSetpgrp, "pid_t setpgrp(void);"},
+    {UnistdSetregid, "int setregid(gid_t, gid_t);"},
+    {UnistdSetreuid, "int setreuid(uid_t, uid_t);"},
+    {UnistdSetsid, "pid_t setsid(void);"},
+    {UnistdSetuid, "int setuid(uid_t);"},
+    {UnistdSleep, "unsigned int sleep(unsigned int);"},
+/*    {UnistdSwab, "void swab(void *, void *, ssize_t);"}, */
+    {UnistdSymlink, "int symlink(char *, char *);"},
+    {UnistdSync, "void sync(void);"},
+    {UnistdSysconf, "long sysconf(int);"},
+    {UnistdTcgetpgrp, "pid_t tcgetpgrp(int);"},
+    {UnistdTcsetpgrp, "int tcsetpgrp(int, pid_t);"},
+    {UnistdTruncate, "int truncate(char *, off_t);"},
+    {UnistdTtyname, "char *ttyname(int);"},
+    {UnistdTtyname_r, "int ttyname_r(int, char *, size_t);"},
+    {UnistdUalarm, "useconds_t ualarm(useconds_t, useconds_t);"},
+    {UnistdUnlink, "int unlink(char *);"},
+    {UnistdUsleep, "int usleep(useconds_t);"},
+    {UnistdVfork, "pid_t vfork(void);"},
+    {UnistdWrite, "ssize_t write(int, void *, size_t);"},
+    {NULL, NULL}
 };
 
 /* creates various system-dependent definitions */