Index: libcio/conin.c
===================================================================
--- libcio/conin.c	(revision 0170798b12759074fed5907913036a90fd1a0a32)
+++ libcio/conin.c	(revision 33b5477cc55f55fdeb5a70526c020aaaaee92017)
@@ -11,5 +11,5 @@
 int16_t _CBused;
 
-int16_t _conin(int8_t *buff, int16_t len)
+int16_t _conin(io_arg arg, int8_t *buff, int16_t len)
 {
 	int16_t 	nbp;
Index: libcio/conin.x
===================================================================
--- libcio/conin.x	(revision 0170798b12759074fed5907913036a90fd1a0a32)
+++ libcio/conin.x	(revision 33b5477cc55f55fdeb5a70526c020aaaaee92017)
@@ -7,4 +7,5 @@
 #pragma once
 
+#include "fspars.h"
 #include "stdint.h"
 
@@ -24,3 +25,3 @@
 */
 
-extern	int16_t		_conin(int8_t *buff, int16_t len);
+extern	int16_t		_conin(io_arg arg, int8_t *buff, int16_t len);
Index: libcio/dirfns.c
===================================================================
--- libcio/dirfns.c	(revision 0170798b12759074fed5907913036a90fd1a0a32)
+++ libcio/dirfns.c	(revision 33b5477cc55f55fdeb5a70526c020aaaaee92017)
@@ -78,5 +78,5 @@
 */
 
-int8_t *dtunpk(int16_t din, int16_t tin, int16_t fmt, int8_t *s)
+int8_t *dtunpk(int16_t din, int16_t tin, int8_t *s, int16_t fmt)
 {
 	register int16_t	ftm, fdt;
Index: libcio/dirfns.x
===================================================================
--- libcio/dirfns.x	(revision 0170798b12759074fed5907913036a90fd1a0a32)
+++ libcio/dirfns.x	(revision 33b5477cc55f55fdeb5a70526c020aaaaee92017)
@@ -16,4 +16,4 @@
 
 extern	int8_t		*atrstr(int16_t atr, int8_t s[]);
-extern	int8_t		*dtunpk(int16_t din, int16_t tin, int16_t fmt, int8_t *s);
+extern	int8_t		*dtunpk(int16_t din, int16_t tin, int8_t *s, int16_t fmt);
 extern	int8_t		*mname(int16_t n);
Index: libcio/filesys.c
===================================================================
--- libcio/filesys.c	(revision 0170798b12759074fed5907913036a90fd1a0a32)
+++ libcio/filesys.c	(revision 33b5477cc55f55fdeb5a70526c020aaaaee92017)
@@ -90,5 +90,5 @@
 */
 
-uint16_t _getfat(uint16_t *bufad, uint16_t nfat, struct bpb *bpp)
+uint16_t _getfat(uint16_t *bufad, struct bpb *bpp, uint16_t nfat)
 {
 	uint16_t fatsec;
Index: libcio/filesys.x
===================================================================
--- libcio/filesys.x	(revision 0170798b12759074fed5907913036a90fd1a0a32)
+++ libcio/filesys.x	(revision 33b5477cc55f55fdeb5a70526c020aaaaee92017)
@@ -44,5 +44,5 @@
 extern	int16_t		_fmake(struct fcb *fcp);
 extern	int16_t		_ftrnc(struct dirent *dp);
-extern	uint16_t	_getfat(uint16_t *bufad, uint16_t nfat, struct bpb *bpp);
+extern	uint16_t	_getfat(uint16_t *bufad, struct bpb *bpp, uint16_t nfat);
 extern	uint16_t	_gtcl12(int8_t *fat, uint16_t cl);
 extern	int16_t		_inifcb(struct fcb *fcp, int8_t *name, int8_t *ext, int16_t mode);
Index: libcio/fsinit.c
===================================================================
--- libcio/fsinit.c	(revision 0170798b12759074fed5907913036a90fd1a0a32)
+++ libcio/fsinit.c	(revision 33b5477cc55f55fdeb5a70526c020aaaaee92017)
@@ -109,5 +109,5 @@
 */
 
-void Init_CB(FILE *fp, int8_t unit, int8_t flags, int32_t *bufad, int16_t bufsize)
+void Init_CB(FILE *fp, int8_t flags, int8_t unit, int32_t *bufad, int16_t bufsize)
 {
 	fp->_bp     = (int8_t *)0L;
Index: libcio/fsinit.x
===================================================================
--- libcio/fsinit.x	(revision 0170798b12759074fed5907913036a90fd1a0a32)
+++ libcio/fsinit.x	(revision 33b5477cc55f55fdeb5a70526c020aaaaee92017)
@@ -39,5 +39,5 @@
 extern	void		InitCH(struct channel *cp, int8_t rdi, int8_t wri, int8_t ioi, int8_t ski, chclo cfp, io_arg charg);
 extern	void		InitFS(void);
-extern	void		Init_CB(FILE *fp, int8_t unit, int8_t flags, int32_t *bufad, int16_t bufsize);
+extern	void		Init_CB(FILE *fp, int8_t flags, int8_t unit, int32_t *bufad, int16_t bufsize);
 extern	int16_t		_badfd(void);
 extern	int16_t		_noper(void);