diff --git a/sys/ufs/ffs/ffs_alloc.c b/sys/ufs/ffs/ffs_alloc.c
index 7feaa512e828..0efd3fcd6644 100644
--- a/sys/ufs/ffs/ffs_alloc.c
+++ b/sys/ufs/ffs/ffs_alloc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_alloc.c	8.8 (Berkeley) 2/21/94
- * $Id: ffs_alloc.c,v 1.5 1994/10/10 01:04:34 phk Exp $
+ * $Id: ffs_alloc.c,v 1.6 1995/01/09 16:05:17 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -47,6 +47,7 @@
 
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
+#include <ufs/ufs/ufs_extern.h>		/* YF - needed for ufs_getlbns() */
 
 #include <ufs/ffs/fs.h>
 #include <ufs/ffs/ffs_extern.h>
@@ -95,7 +96,11 @@ ffs_alloc(ip, lbn, bpref, size, cred, bnp)
 {
 	register struct fs *fs;
 	daddr_t bno;
-	int cg, error;
+	int cg;
+#ifdef QUOTA
+	int error;
+#endif
+	
 	
 	*bnp = 0;
 	fs = ip->i_fs;
@@ -181,8 +186,8 @@ ffs_realloccg(ip, lbprev, bpref, osize, nsize, cred, bpp)
 	if (cred->cr_uid != 0 && freespace(fs, fs->fs_minfree) <= 0)
 		goto nospace;
 	if ((bprev = ip->i_db[lbprev]) == 0) {
-		printf("dev = 0x%x, bsize = %d, bprev = %d, fs = %s\n",
-		    ip->i_dev, fs->fs_bsize, bprev, fs->fs_fsmnt);
+		printf("dev = 0x%lx, bsize = %ld, bprev = %ld, fs = %s\n",
+		    (u_long) ip->i_dev, fs->fs_bsize, bprev, fs->fs_fsmnt);
 		panic("ffs_realloccg: bad bprev");
 	}
 	/*
@@ -1122,7 +1127,7 @@ ffs_nodealloccg(ip, cg, ipref, mode)
 		start = 0;
 		loc = skpc(0xff, len, &cg_inosused(cgp)[0]);
 		if (loc == 0) {
-			printf("cg = %d, irotor = %d, fs = %s\n",
+			printf("cg = %d, irotor = %ld, fs = %s\n",
 			    cg, cgp->cg_irotor, fs->fs_fsmnt);
 			panic("ffs_nodealloccg: map corrupted");
 			/* NOTREACHED */
@@ -1182,7 +1187,7 @@ ffs_blkfree(ip, bno, size)
 	}
 	cg = dtog(fs, bno);
 	if ((u_int)bno >= fs->fs_size) {
-		printf("bad block %d, ino %d\n", bno, ip->i_number);
+		printf("bad block %ld, ino %ld\n", bno, ip->i_number);
 		ffs_fserr(fs, ip->i_uid, "bad block");
 		return;
 	}
@@ -1202,8 +1207,8 @@ ffs_blkfree(ip, bno, size)
 	if (size == fs->fs_bsize) {
 		blkno = fragstoblks(fs, bno);
 		if (ffs_isblock(fs, cg_blksfree(cgp), blkno)) {
-			printf("dev = 0x%x, block = %d, fs = %s\n",
-			    ip->i_dev, bno, fs->fs_fsmnt);
+			printf("dev = 0x%lx, block = %ld, fs = %s\n",
+			    (u_long) ip->i_dev, bno, fs->fs_fsmnt);
 			panic("blkfree: freeing free block");
 		}
 		ffs_setblock(fs, cg_blksfree(cgp), blkno);
@@ -1227,8 +1232,8 @@ ffs_blkfree(ip, bno, size)
 		frags = numfrags(fs, size);
 		for (i = 0; i < frags; i++) {
 			if (isset(cg_blksfree(cgp), bno + i)) {
-				printf("dev = 0x%x, block = %d, fs = %s\n",
-				    ip->i_dev, bno + i, fs->fs_fsmnt);
+				printf("dev = 0x%lx, block = %ld, fs = %s\n",
+				    (u_long) ip->i_dev, bno + i, fs->fs_fsmnt);
 				panic("blkfree: freeing free frag");
 			}
 			setbit(cg_blksfree(cgp), bno + i);
@@ -1302,7 +1307,7 @@ ffs_vfree(ap)
 	cgp->cg_time = time.tv_sec;
 	ino %= fs->fs_ipg;
 	if (isclr(cg_inosused(cgp), ino)) {
-		printf("dev = 0x%lx, ino = %d, fs = %s\n",
+		printf("dev = 0x%lx, ino = %ld, fs = %s\n",
 		    (u_long)pip->i_dev, ino, fs->fs_fsmnt);
 		if (fs->fs_ronly == 0)
 			panic("ifree: freeing free inode");
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index b21d6a37bdd5..efcb7fb10d9a 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_vnops.c	8.10 (Berkeley) 4/1/94
- * $Id: ufs_vnops.c,v 1.13 1994/11/26 19:38:30 bde Exp $
+ * $Id: ufs_vnops.c,v 1.14 1995/01/09 16:05:27 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -58,6 +58,7 @@
 #include <vm/vm.h>
 
 #include <miscfs/specfs/specdev.h>
+#include <miscfs/fifofs/fifo.h>
 
 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/inode.h>
diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h
index 8c133d23b76c..538836d38a44 100644
--- a/sys/vm/vm_page.h
+++ b/sys/vm/vm_page.h
@@ -61,7 +61,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_page.h,v 1.12 1995/01/10 09:19:52 davidg Exp $
+ * $Id: vm_page.h,v 1.13 1995/01/24 10:13:45 davidg Exp $
  */
 
 /*
@@ -226,6 +226,7 @@ extern simple_lock_data_t vm_page_queue_free_lock; /* lock on free page queue */
 
 void vm_page_activate __P((vm_page_t));
 vm_page_t vm_page_alloc __P((vm_object_t, vm_offset_t, int));
+void vm_page_cache __P((register vm_page_t));
 void vm_page_copy __P((vm_page_t, vm_page_t));
 void vm_page_deactivate __P((vm_page_t));
 void vm_page_free __P((vm_page_t));
@@ -244,6 +245,9 @@ void vm_page_set_valid __P((vm_page_t, int, int));
 void vm_page_set_invalid __P((vm_page_t, int, int));
 int vm_page_is_valid __P((vm_page_t, int, int));
 void vm_page_test_dirty __P((vm_page_t));
+int vm_page_unqueue __P((vm_page_t ));
+int vm_page_bits __P((int, int));
+
 
 
 /*
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 28970f259372..10ff31176345 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -65,7 +65,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- * $Id: vm_pageout.c,v 1.33 1995/02/02 09:09:15 davidg Exp $
+ * $Id: vm_pageout.c,v 1.34 1995/02/09 07:41:42 davidg Exp $
  */
 
 /*
@@ -78,6 +78,7 @@
 #include <sys/resourcevar.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
+#include <sys/signalvar.h>
 
 #include <vm/vm.h>
 #include <vm/vm_page.h>
@@ -501,9 +502,6 @@ vm_pageout_scan()
 	vm_offset_t size, bigsize;
 	vm_object_t object;
 	int force_wakeup = 0;
-	int cache_size, orig_cache_size;
-	int minscan;
-	int mintofree;
 
 	/* calculate the total cached size */
 
@@ -816,9 +814,8 @@ vm_pageout()
 }
 
 void
-vm_daemon()
+vm_daemon __P((void))
 {
-	int cache_size;
 	vm_object_t object;
 	struct proc *p;