diff --git a/cde/lib/tt/mini_isam/isaddindex.c b/cde/lib/tt/mini_isam/isaddindex.c
index 64a910d7e..e9d59d185 100644
--- a/cde/lib/tt/mini_isam/isaddindex.c
+++ b/cde/lib/tt/mini_isam/isaddindex.c
@@ -58,7 +58,6 @@
 int 
 isaddindex(int isfd, struct keydesc *keydesc)
 {
-    int			_amaddindex();
     Fab	*fab;
     int			ret;
 
diff --git a/cde/lib/tt/mini_isam/isaddprimary.c b/cde/lib/tt/mini_isam/isaddprimary.c
index 9d8869d20..66cc99e3b 100644
--- a/cde/lib/tt/mini_isam/isaddprimary.c
+++ b/cde/lib/tt/mini_isam/isaddprimary.c
@@ -40,7 +40,7 @@
 #include "isam_impl.h"
 #include <sys/time.h>
 
-Static int _am_addprimary();
+Static int _am_addprimary(Fab *fab, struct keydesc *keydesc);
 
 
 /*
diff --git a/cde/lib/tt/mini_isam/isam.h b/cde/lib/tt/mini_isam/isam.h
index eeb1e6e53..a0931357f 100644
--- a/cde/lib/tt/mini_isam/isam.h
+++ b/cde/lib/tt/mini_isam/isam.h
@@ -52,12 +52,15 @@ SMI */
 #define LONG_BIT 32
 #endif
 
-extern short ldint();
-extern long ldlong();
-extern float ldfloat();
-extern double lddbl();
+extern short ldint(char *);
+extern long ldlong(char *);
+extern float ldfloat(char *);
+extern double lddbl(char *);
 extern short ldshort();
-extern int ldchar(), stchar(), stlong(), stdbl();
+extern int ldchar(char *, int, char *);
+extern int stchar(char *, char *, int);
+extern int stlong(long, char *);
+extern int stdbl(double, char *);
 extern int stint(short val, char *p);
 extern int stfloat(float f, char *p);
 
diff --git a/cde/lib/tt/mini_isam/isam_impl.h b/cde/lib/tt/mini_isam/isam_impl.h
index c11ac7820..058d60f23 100644
--- a/cde/lib/tt/mini_isam/isam_impl.h
+++ b/cde/lib/tt/mini_isam/isam_impl.h
@@ -162,9 +162,9 @@ typedef struct bytearray {
     char	*data;
 } Bytearray;
 
-extern Bytearray _bytearr_getempty(), _bytearr_dup();
+extern Bytearray _bytearr_getempty(), _bytearr_dup(Bytearray *);
 extern Bytearray _bytearr_new(u_short len, char *data);
-extern void _bytearr_free();
+extern void _bytearr_free(Bytearray *);
 
 
 /* Client identification - used to identify owners of locks */
@@ -176,9 +176,8 @@ extern void _bytearr_free();
 #define MAXISFD		FD_SETSIZE
 #define NOISFD		(-1)		     /* Not a valid file descriptor */
 
-extern struct fab *_isfd_find();
-extern void _isfd_delete();
-extern Isfd _isfd_insert();
+extern struct fab *_isfd_find(Isfd);
+extern void _isfd_delete(Isfd);
 
 /* Definitions related to File access block (isfab.c file */
 
@@ -194,8 +193,8 @@ enum readmode { RM_FIRST = 0, RM_LAST = 1, RM_NEXT = 2, RM_PREV = 3,
 /* lock flag is passed to Access Method module for every record oriented op. */
 /* Bit position in the lock flag: */
 
-enum openmode _getopenmode();
-enum readmode _getreadmode();
+enum openmode _getopenmode(int);
+enum readmode _getreadmode(int);
 
 /* Error code structure */
 struct errcode {
@@ -228,8 +227,8 @@ typedef struct fab {
 
 #define FAB_ISFDSET(fab, isfd) (fab->isfd = isfd)
 
-extern Fab *_fab_new();
-void _fab_destroy();
+extern Fab *_fab_new(char *, enum openmode, Bool, int, int);
+void _fab_destroy(Fab *);
 
 /* ISAM file identification for locking purposes. */
 typedef struct lckfid {
diff --git a/cde/lib/tt/mini_isam/isam_prototypes.h b/cde/lib/tt/mini_isam/isam_prototypes.h
index a13eaac6c..e165daf12 100644
--- a/cde/lib/tt/mini_isam/isam_prototypes.h
+++ b/cde/lib/tt/mini_isam/isam_prototypes.h
@@ -166,7 +166,7 @@ int iserase(char *isfname);
 void _isfatal_error(char *msg);
 void _isfatal_error1(char *msg);
 void _isam_warning(char *msg);
-int _isfatal_error_set_func(int (*func)(void));
+int _isfatal_error_set_func(int (*func)(char *));
 void _setiserrno2(int error, int is1, int is2);
 void _seterr_errcode(struct errcode *errcode);
 
diff --git a/cde/lib/tt/mini_isam/isamaddindex.c b/cde/lib/tt/mini_isam/isamaddindex.c
index f9adb6757..a77c9c72f 100644
--- a/cde/lib/tt/mini_isam/isamaddindex.c
+++ b/cde/lib/tt/mini_isam/isamaddindex.c
@@ -42,11 +42,10 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-extern int _iskeycmp();
-
-static void _readallrecords(), _attach_dups_serial();
-static Blkno _buildbtree();
-static int _duplicate_exist();
+static void _readallrecords(Fcb *fcb, Issort *srt, Keydesc2 *pkeydesc2);
+static void _attach_dups_serial(Issort *srt, Keydesc2 *pkeydesc2);
+static Blkno _buildbtree(Fcb *fcb, Keydesc2 *pkeydesc2, Issort *srt);
+static int _duplicate_exist(Issort *srt, int keylength);
 static void checkavailfd(void);
 
 /*
@@ -386,7 +385,7 @@ _readallrecords(Fcb *fcb, Issort *srt, Keydesc2 *pkeydesc2)
 	char		keybuf [MAXKEYSIZE];
 	Recno		recnum;
 	int		reclen = 0;
-	int		(*rec_read)() = (fcb->varflag?_vlrec_read:_flrec_read);
+	int		(*rec_read)(Fcb *, char *, Recno, int *) = (fcb->varflag?_vlrec_read:_flrec_read);
 	
 	for (recnum = 1; recnum <= fcb->lastrecno; recnum++) {
 	
@@ -457,7 +456,6 @@ _attach_dups_serial(Issort *srt, Keydesc2 *pkeydesc2)
 Static Blkno 
 _buildbtree(Fcb *fcb, Keydesc2 *pkeydesc2, Issort *srt)
 {
-    Bufhdr		*_allockpage();
     int			depth;
     int 		nrecords = fcb->nrecords;
     int			keyspernode[ISMAXBTRLEVEL];
diff --git a/cde/lib/tt/mini_isam/isamdelrec.c b/cde/lib/tt/mini_isam/isamdelrec.c
index 7f3537d14..a79fffacf 100644
--- a/cde/lib/tt/mini_isam/isamdelrec.c
+++ b/cde/lib/tt/mini_isam/isamdelrec.c
@@ -40,7 +40,7 @@
 
 #include "isam_impl.h"
 
-void _delkeys();
+void _delkeys(Fcb *fcb, char *record, Recno recnum);
 
 /*
  * _amdelrec(isfhandle, recnum, errcode)
@@ -62,8 +62,8 @@ _amdelrec(Bytearray *isfhandle, Recno recnum, struct errcode *errcode)
     Fcb			*fcb = NULL;
     char		recbuf[ISMAXRECLEN];
     int			reclen;
-    int			(*rec_read)();
-    int			(*rec_delete)();
+    int			(*rec_read)(Fcb *, char *, Recno, int *);
+    int			(*rec_delete)(Fcb *, Recno);
 
     _isam_entryhook();
 
diff --git a/cde/lib/tt/mini_isam/isamwrite.c b/cde/lib/tt/mini_isam/isamwrite.c
index b2922a721..258947ed5 100644
--- a/cde/lib/tt/mini_isam/isamwrite.c
+++ b/cde/lib/tt/mini_isam/isamwrite.c
@@ -40,7 +40,7 @@
 
 #include "isam_impl.h"
 
-static int _addkeys2 ();
+static int _addkeys2 (Fcb *fcb, char *record, Recno recnum, Bytearray *curpos);
 extern long *ismaxlong;
 
 /*
@@ -70,7 +70,7 @@ _amwrite(Bytearray *isfhandle, char *record, int reclen,
     Recno		recnum2;
     Crp 		*crp;
     int			err;
-    int			(*rec_write)();
+    int			(*rec_write)(Fcb *, char *, Recno *, int);
 
     _isam_entryhook();
 
diff --git a/cde/lib/tt/mini_isam/isbtree2.c b/cde/lib/tt/mini_isam/isbtree2.c
index 50fb423c3..9d14a40dd 100644
--- a/cde/lib/tt/mini_isam/isbtree2.c
+++ b/cde/lib/tt/mini_isam/isbtree2.c
@@ -40,8 +40,6 @@
 
 #include "isam_impl.h"
 
-extern int _iskeycmp();
-
 void leftkey_up(Btree *, int);
 
 static void insert_key(Btree *, char *, int, char *, Blkno);
diff --git a/cde/lib/tt/mini_isam/isbtree3.c b/cde/lib/tt/mini_isam/isbtree3.c
index adb6c4c48..532f929af 100644
--- a/cde/lib/tt/mini_isam/isbtree3.c
+++ b/cde/lib/tt/mini_isam/isbtree3.c
@@ -40,8 +40,6 @@
 
 #include "isam_impl.h"
 
-extern int _iskeycmp();
-
 static void remove_entry(Btree *, char *, int);
 static void move_from_right(Btree *, char *, char *, int);
 static void move_from_left(Btree *, char *, char *, int);
diff --git a/cde/lib/tt/mini_isam/iscntl.c b/cde/lib/tt/mini_isam/iscntl.c
index 29c65e39c..fd4a91560 100644
--- a/cde/lib/tt/mini_isam/iscntl.c
+++ b/cde/lib/tt/mini_isam/iscntl.c
@@ -70,7 +70,7 @@
  *
  */
 
-typedef int (* intfunc)();
+typedef int (* intfunc)(char *);
 
 int 
 iscntl(int isfd, int func, ...)
diff --git a/cde/lib/tt/mini_isam/isdelcurr.c b/cde/lib/tt/mini_isam/isdelcurr.c
index 6460d1c17..dc8b589cf 100644
--- a/cde/lib/tt/mini_isam/isdelcurr.c
+++ b/cde/lib/tt/mini_isam/isdelcurr.c
@@ -40,7 +40,7 @@
 #include "isam_impl.h"
 #include <sys/time.h>
 
-static int _amdelcurr();
+static int _amdelcurr(Bytearray *isfhandle, Bytearray *curpos, Recno *recnum, struct errcode *errcod);
 
 /*
  * err = isdelcurr(isfd, record)
@@ -118,8 +118,8 @@ _amdelcurr(Bytearray *isfhandle, Bytearray *curpos, Recno *recnum,
     Crp			*crp;
     char		recbuf[ISMAXRECLEN];
     int			reclen;
-    int			(*rec_read)();
-    int			(*rec_delete)();
+    int			(*rec_read)(Fcb *, char *, Recno, int *);
+    int			(*rec_delete)(Fcb *, Recno);
 
     _isam_entryhook();
 
diff --git a/cde/lib/tt/mini_isam/isdelrec.c b/cde/lib/tt/mini_isam/isdelrec.c
index 49fe8a6da..56e3d9e5b 100644
--- a/cde/lib/tt/mini_isam/isdelrec.c
+++ b/cde/lib/tt/mini_isam/isdelrec.c
@@ -62,7 +62,6 @@
 int 
 isdelrec(int isfd, long recnum)
 {
-    int			_amdelrec();
     Fab	*fab;
     int			ret;
 
diff --git a/cde/lib/tt/mini_isam/isdiskbufs2.c b/cde/lib/tt/mini_isam/isdiskbufs2.c
index f54520424..e36f3439e 100644
--- a/cde/lib/tt/mini_isam/isdiskbufs2.c
+++ b/cde/lib/tt/mini_isam/isdiskbufs2.c
@@ -62,9 +62,13 @@ extern struct dlink *_isdln_next(), *_isdln_first();
 #define _isdln_isempty(l)  _isdln_base_isempty(base,(l))
 
 /*---------------------- Local data ---------------------------------------*/
-static Bufhdr *_getavail(), *_findblock();
-static void _disk_init(), _commit1buffer(), _rollback1buffer(), _flush1buffer();
-static void _makenodata();
+static Bufhdr *_getavail(void);
+static Bufhdr *_findblock(Fcb *fcb, int unixfd, Blkno blkno);
+static void _disk_init(void);
+static void _commit1buffer(Bufhdr *p);
+static void _rollback1buffer(Bufhdr *p);
+static void _flush1buffer(Bufhdr *p);
+static void _makenodata(Bufhdr *p);
 
 Bufhdr bufhdrs [ISMAXBUFFERS];
 struct dlink  hashhdrs [ISHASHHDRS];	     /* Heads of hashed lists */
diff --git a/cde/lib/tt/mini_isam/iserase.c b/cde/lib/tt/mini_isam/iserase.c
index ce13c2a17..dc84c94ac 100644
--- a/cde/lib/tt/mini_isam/iserase.c
+++ b/cde/lib/tt/mini_isam/iserase.c
@@ -41,8 +41,10 @@
 #include <unistd.h>
 #include <sys/time.h>
 
-static void _unlink_datfile(), _unlink_indfile(), _unlink_varfile();
-static int _amerase();
+static void _unlink_datfile(char *isfname);
+static void _unlink_indfile(char *isfname);
+static void _unlink_varfile(char *isfnam);
+static int _amerase(Bytearray *isfhandle, struct errcode *errcode);
 
 /*
  * isfd = iserase(isfname, mode)
diff --git a/cde/lib/tt/mini_isam/iserror.c b/cde/lib/tt/mini_isam/iserror.c
index 5e339e1a1..0fd64c12f 100644
--- a/cde/lib/tt/mini_isam/iserror.c
+++ b/cde/lib/tt/mini_isam/iserror.c
@@ -48,7 +48,7 @@
  * Fatal error. Display message and terminate program.
  */
 
-static int (*fatal_error_user_handler)();    /* set by iscntl(..,ISCNTL_FATAL,..) */
+static int (*fatal_error_user_handler)(char *);    /* set by iscntl(..,ISCNTL_FATAL,..) */
 
 void 
 _isfatal_error(char *msg)
@@ -109,10 +109,10 @@ _isam_warning(char *msg)
 }
 
 /* Set user specified fatal_error handler */
-int  _isfatal_error_set_func(int(*func)())
+int  _isfatal_error_set_func(int(*func)(char *))
 {
 #if 0
-    int		(*oldfunc)();
+    int		(*oldfunc)(char *);
 
     oldfunc = fatal_error_user_handler;
 #endif
diff --git a/cde/lib/tt/mini_isam/isfcb.c b/cde/lib/tt/mini_isam/isfcb.c
index fc6337377..88cbaaed1 100644
--- a/cde/lib/tt/mini_isam/isfcb.c
+++ b/cde/lib/tt/mini_isam/isfcb.c
@@ -42,9 +42,15 @@
 #include "isam_impl.h"
 #include <sys/stat.h>
 
-static int _create_datfile(), _create_indfile(), _create_varfile();
-static void _remove_datfile(), _remove_indfile(), _remove_varfile();
-Static int _open_datfile(), _open_indfile(), _open_varfile();
+static int _create_datfile(char *isfname);
+static int _create_indfile(char *isfname);
+static int _create_varfile(char *isfname);
+static void _remove_datfile(char *isfname);
+static void _remove_indfile(char *isfname);
+static void _remove_varfile(char *isfname);
+static int _open_datfile(char *isfname, Bool *rdonly);
+static int _open_indfile(char *isfname, Bool rdonly);
+static int _open_varfile(char *isfname, Bool rdonly);
 
 /*
  * _isfcb_create(isfname, crdat, crind, crvar, owner, group, u_mask, errcode)
diff --git a/cde/lib/tt/mini_isam/isfcbindex.c b/cde/lib/tt/mini_isam/isfcbindex.c
index 8068c7ef7..cef653229 100644
--- a/cde/lib/tt/mini_isam/isfcbindex.c
+++ b/cde/lib/tt/mini_isam/isfcbindex.c
@@ -40,7 +40,7 @@
 
 #include "isam_impl.h"
 
-Static int _keypart2cmp();
+Static int _keypart2cmp(struct keypart2 *l, struct keypart2 *r);
 /*
  * _isfcb_primkeyadd(fcb, keydesc2)
  *
diff --git a/cde/lib/tt/mini_isam/isfileio.c b/cde/lib/tt/mini_isam/isfileio.c
index 2f7da8818..fa21623ca 100644
--- a/cde/lib/tt/mini_isam/isfileio.c
+++ b/cde/lib/tt/mini_isam/isfileio.c
@@ -38,8 +38,8 @@
 
 #include "isam_impl.h"
 
-static int _getoffset();
-static Blkno _getblkno();
+static int _getoffset(long pos);
+static Blkno _getblkno(long pos);
 
 
 /*
diff --git a/cde/lib/tt/mini_isam/isfixrec.c b/cde/lib/tt/mini_isam/isfixrec.c
index 13de4b35e..8f9fbfec4 100644
--- a/cde/lib/tt/mini_isam/isfixrec.c
+++ b/cde/lib/tt/mini_isam/isfixrec.c
@@ -39,9 +39,9 @@
 #include "isam_impl.h"
 
 /* Local functions */
-long _fl_getpos();			     /* Get offset in .rec file */
+long _fl_getpos(Fcb *fcb, Recno recnum);			     /* Get offset in .rec file */
 int  _fl_deleted();			     /* 0/1 returns 1 if record is deleted */
-static void remove_from_chain();	     /* used by _flrec_wrrec() */
+static void remove_from_chain(Fcb *fcb, Recno recnum);	     /* used by _flrec_wrrec() */
 
 /*
  * _flrec_write(fcb, record, recnum, reclen)
diff --git a/cde/lib/tt/mini_isam/isfname.c b/cde/lib/tt/mini_isam/isfname.c
index 33ed70f8a..2290a63c0 100644
--- a/cde/lib/tt/mini_isam/isfname.c
+++ b/cde/lib/tt/mini_isam/isfname.c
@@ -40,9 +40,6 @@
 
 #include "isam_impl.h"
 
-void _removelast();
-char *_lastelement();
-
 /*
  * _makedat_isfname(isfname)
  *
diff --git a/cde/lib/tt/mini_isam/isindfreel.c b/cde/lib/tt/mini_isam/isindfreel.c
index 116d166e2..e14940d20 100644
--- a/cde/lib/tt/mini_isam/isindfreel.c
+++ b/cde/lib/tt/mini_isam/isindfreel.c
@@ -39,8 +39,6 @@
 
 #include "isam_impl.h"
 
-extern Bufhdr *_isdisk_fix();
-
 /*
  * blkno = _isfreel_alloc()
  *
diff --git a/cde/lib/tt/mini_isam/iskeyvalid.c b/cde/lib/tt/mini_isam/iskeyvalid.c
index 65f457284..d4adf0371 100644
--- a/cde/lib/tt/mini_isam/iskeyvalid.c
+++ b/cde/lib/tt/mini_isam/iskeyvalid.c
@@ -40,7 +40,7 @@
 
 #include "isam_impl.h"
 
-static int _check_typelen();
+static int _check_typelen(int type, int length);
 
 /*
  * _validate_keydesc(keydesc, minreclen)
diff --git a/cde/lib/tt/mini_isam/ismngfcb.c b/cde/lib/tt/mini_isam/ismngfcb.c
index 23550029a..f4b14aac2 100644
--- a/cde/lib/tt/mini_isam/ismngfcb.c
+++ b/cde/lib/tt/mini_isam/ismngfcb.c
@@ -60,7 +60,7 @@ struct hashtable {
 } hashtable [FCBHASHSIZE];
 #define unused(entry) ((entry).fcb == NULL)
 
-static int _hashisfhandle();
+static int _hashisfhandle(Bytearray *isfhandle);
 
 static int mrused_last = 0;			     /* stamp generator */
 
diff --git a/cde/lib/tt/mini_isam/isopen.c b/cde/lib/tt/mini_isam/isopen.c
index 44b1a3d10..dfd08bf2a 100644
--- a/cde/lib/tt/mini_isam/isopen.c
+++ b/cde/lib/tt/mini_isam/isopen.c
@@ -41,7 +41,7 @@
 #include <sys/file.h>
 #include <sys/time.h>
 
-static int _am_open();
+static int _am_open(Fab *fab);
 /*
  * isfd = isopen(isfname, mode)
  *
diff --git a/cde/lib/tt/mini_isam/isread.c b/cde/lib/tt/mini_isam/isread.c
index 4abfc13af..6c07cebbe 100644
--- a/cde/lib/tt/mini_isam/isread.c
+++ b/cde/lib/tt/mini_isam/isread.c
@@ -40,7 +40,9 @@
 #include "isam_impl.h"
 #include <sys/time.h>
 
-static int _amread();
+static int _amread(Bytearray *isfhandle, char *record, int *reclen,
+        enum readmode readmode, Bytearray *curpos, Recno *recnum,
+        struct errcode *errcode);
 
 /*
  * err =  isread(isfd, record, mode)
@@ -159,7 +161,7 @@ _amread(Bytearray *isfhandle, char *record, int *reclen,
     int			skipbytes;
     int			ret;
     Bytearray		oldcurpos;
-    int			(*rec_read)();
+    int			(*rec_read)(Fcb *, char *, Recno, int *);
 
     _isam_entryhook();
 
diff --git a/cde/lib/tt/mini_isam/isrename.c b/cde/lib/tt/mini_isam/isrename.c
index 814366111..1f6555f8c 100644
--- a/cde/lib/tt/mini_isam/isrename.c
+++ b/cde/lib/tt/mini_isam/isrename.c
@@ -41,11 +41,11 @@
 #include <unistd.h>
 #include <sys/time.h>
 
-void _removelast();
-static void _removelast2();
-char *_lastelement();
-static void _rename_datfile(), _rename_indfile(), _rename_varfile();
-static int _amrename();
+static void _removelast2(char *);
+static void _rename_datfile(char *isfname, char *newnam);
+static void _rename_indfile(char *isfname, char *newnam);
+static void _rename_varfile(char *isfname, char *newnam);
+static int _amrename(Bytearray *isfhandle, char *newname, struct errcode *errcode);
 
 /*
  * isfd = isrename(oldname, newname)
diff --git a/cde/lib/tt/mini_isam/isrepair.c b/cde/lib/tt/mini_isam/isrepair.c
index d7388eda0..bf29e7adf 100644
--- a/cde/lib/tt/mini_isam/isrepair.c
+++ b/cde/lib/tt/mini_isam/isrepair.c
@@ -63,16 +63,16 @@
  *   verbose option (if set to nonzero) will print messages to stdout.
  */
 
-Static	char *rp_readrecord_v(), *rp_readrecord_f();
+Static char *rp_readrecord_v(int datfd, int varfd, long offset, int minreclen, int maxreclen);
+Static char *rp_readrecord_f(int datfd, long offset, int reclen);
 Static int printkey(int, struct keydesc *, int (*)(const char *, ...));
 Static void cmd_error(const char *, int (*)(const char *, ...));
-Static int typeletter();
-Static int rp_readcntlpg();
+Static int typeletter(int type);
+Static int rp_readcntlpg(int datfd, char *cntlpg);
 static int  isnoprintf(const char *, ...);
 
 int isrepair(char *isfname, int verbose)
 {
-  extern      char *rp_readrecord_v(), *rp_readrecord_f();
   char	      cntlpg[ISCNTLSIZE];
   int	      datfd = -1, indfd = -1, varfd = -1;
   int	      minreclen, maxreclen;
diff --git a/cde/lib/tt/mini_isam/isrewcurr.c b/cde/lib/tt/mini_isam/isrewcurr.c
index fe6f03c35..f52715542 100644
--- a/cde/lib/tt/mini_isam/isrewcurr.c
+++ b/cde/lib/tt/mini_isam/isrewcurr.c
@@ -40,7 +40,10 @@
 #include "isam_impl.h"
 #include <sys/time.h>
 
-static int _amrewcurr(), _changekeys2();
+static int _amrewcurr(Bytearray *isfhandle, char *record, int reclen,
+           Bytearray *curpos, Recno *recnum, struct errcode *errcode);
+static int _changekeys2(Fcb *fcb, char *record, char *oldrecord,
+             Recno recnum, Bytearray *curpos);
 
 /*
  * err = isrewcurr(isfd, record)
@@ -138,8 +141,8 @@ _amrewcurr(Bytearray *isfhandle, char *record, int reclen,
     int			err;
     char		oldrecord[ISMAXRECLEN];
     int			reclen2;
-    int			(*rec_read)();
-    int			(*rec_rewrite)();
+    int			(*rec_read)(Fcb *, char *, Recno, int *);
+    int			(*rec_rewrite)(Fcb *, char *, Recno, int);
 
     _isam_entryhook();
 
diff --git a/cde/lib/tt/mini_isam/isrewrec.c b/cde/lib/tt/mini_isam/isrewrec.c
index bf77da4de..e9c1c71db 100644
--- a/cde/lib/tt/mini_isam/isrewrec.c
+++ b/cde/lib/tt/mini_isam/isrewrec.c
@@ -40,7 +40,8 @@
 #include "isam_impl.h"
 #include <sys/time.h>
 
-static int _amrewrec(), _changekeys();
+static int _amrewrec(Bytearray *isfhandle, char *record, int reclen, Recno recnum, struct errcode *errcode);
+static int _changekeys(Fcb *fcb, char *record, char *oldrecord, Recno recnum);
 
 /*
  * err = isrewrec(isfd, recnum, record)
@@ -132,8 +133,8 @@ _amrewrec(Bytearray *isfhandle, char *record, int reclen, Recno recnum,
     char		oldrecbuf[ISMAXRECLEN];
     int			err;
     int			reclen2;
-    int			(*rec_read)();
-    int			(*rec_rewrite)();
+    int			(*rec_read)(Fcb *, char *, Recno, int *);
+    int			(*rec_rewrite)(Fcb *, char *, Recno, int);
 
     _isam_entryhook();
 
diff --git a/cde/lib/tt/mini_isam/isstart.c b/cde/lib/tt/mini_isam/isstart.c
index dc0b4e1a5..4e0f47b34 100644
--- a/cde/lib/tt/mini_isam/isstart.c
+++ b/cde/lib/tt/mini_isam/isstart.c
@@ -41,7 +41,9 @@
 #include <sys/time.h>
 #include <stdlib.h>
 
-static int _amstart();
+static int _amstart(Bytearray *isfhandle, char *record, int *reclen,
+         enum readmode readmode, struct keydesc *keydesc, int keylen,
+         Bytearray *curpos, Recno *recnum, struct errcode *errcod);
 
 /*
  * err =  isstart(isfd, keydesc, length, record, mode)
@@ -171,7 +173,7 @@ _amstart(Bytearray *isfhandle, char *record, int *reclen,
     char		*pkey;
     Btree		*btree = NULL;
     int			reclen2;
-    int			(*rec_read)();
+    int			(*rec_read)(Fcb *, char *, Recno, int *);
 
     _isam_entryhook();
 
diff --git a/cde/lib/tt/mini_isam/isvarrec.c b/cde/lib/tt/mini_isam/isvarrec.c
index 68878a0b8..a9e87888d 100644
--- a/cde/lib/tt/mini_isam/isvarrec.c
+++ b/cde/lib/tt/mini_isam/isvarrec.c
@@ -39,12 +39,12 @@
 #include "isam_impl.h"
 
 /* Local functions */
-long _vl_getpos();			     /* Get offset in .rec file */
+long _vl_getpos(Fcb *fcb, Recno recnum);			     /* Get offset in .rec file */
 int  _vl_deleted();			     /* 0/1 returns 1 if record is deleted */
-static void remove_from_chain2();	     /* used by _vlrec_wrrec() */
-long _istail_insert();
-static void _istail_delete();
-static int _istail_read();
+static void remove_from_chain2(Fcb *fcb, Recno recnum);	     /* used by _vlrec_wrrec() */
+long _istail_insert(Fcb *fcb, char *tailp, int taillen);
+static void _istail_delete(Fcb *fcb, long offset);
+static int _istail_read(Fcb *fcb, long offset, char *buffer);
 
 /*
  * _vlrec_write(fcb, record, recnum, reclen)
diff --git a/cde/lib/tt/mini_isam/iswrite.c b/cde/lib/tt/mini_isam/iswrite.c
index 46726799f..75cc3c85b 100644
--- a/cde/lib/tt/mini_isam/iswrite.c
+++ b/cde/lib/tt/mini_isam/iswrite.c
@@ -41,7 +41,8 @@
 #include <sys/file.h>
 #include <sys/time.h>
 
-static int _am_write();
+static int _am_write(Fab *fab, char *record, int reclen,
+                     Bytearray *curpos, Recno *recnum);
 
 /*
  * err =  iswrite(isfd, record)
@@ -70,7 +71,6 @@ static int _am_write();
 int 
 iswrite(int isfd, char *record)
 {
-    int			_am_write();
     Fab	*fab;
     int			reclen;
     Recno		recnum;
diff --git a/cde/lib/tt/mini_isam/iswrrec.c b/cde/lib/tt/mini_isam/iswrrec.c
index c0f986288..b4f13a28c 100644
--- a/cde/lib/tt/mini_isam/iswrrec.c
+++ b/cde/lib/tt/mini_isam/iswrrec.c
@@ -39,7 +39,8 @@
 #include "isam_impl.h"
 #include <sys/time.h>
 
-static int _amwrrec();
+static int _amwrrec(Bytearray *isfhandle, char *record, int reclen, Recno recnum,
+         struct errcode *errcode);
 
 /*
  * isfd = iswrrec(isfd, recnum, record)
@@ -130,7 +131,7 @@ _amwrrec(Bytearray *isfhandle, char *record, int reclen, Recno recnum,
 {
     Fcb			*fcb = NULL;
     int			err;
-    int			(*rec_wrrec)();
+    int			(*rec_wrrec)(Fcb *, char *, Recno, int);
 
     _isam_entryhook();