diff --git a/lkm/ibcs2/Makefile b/lkm/ibcs2/Makefile
index 83be90f63eb4..6069595cb6b2 100644
--- a/lkm/ibcs2/Makefile
+++ b/lkm/ibcs2/Makefile
@@ -1,16 +1,18 @@
-#	$Id: Makefile,v 1.4 1994/10/27 23:36:57 wollman Exp $
+#	Makefile,v 1.5 1994/12/11 21:27:14 wollman Exp
 
 .PATH:	${.CURDIR}/../../sys/i386/ibcs2
 KMOD=	ibcs2_mod
-SRCS= 	ibcs2.c ibcs2_dummy.c ibcs2_file.c ibcs2_ioctl.c ibcs2_ipc.c \
-	ibcs2_isc.c ibcs2_misc.c ibcs2_signal.c ibcs2_stats.c \
-	ibcs2_sysent.c ibcs2_sysi86.c ibcs2_xenix.c vnode_if.h
+SRCS=	ibcs2.c ibcs2_errno.c ibcs2_ipc.c ibcs2_stat.c ibcs2_misc.c \
+	ibcs2_fcntl.c ibcs2_signal.c ibcs2_sysent.c ibcs2_ioctl.c \
+	ibcs2_socksys.c ibcs2_util.c ibcs2_xenix.c ibcs2_xenix_sysent.c \
+	ibcs2_isc.c ibcs2_isc_sysent.c \
+	ibcs2_msg.c ibcs2_other.c ibcs2_sysi86.c ibcs2_sysvec.c vnode_if.h
 NOMAN=
 CFLAGS+= -DLKM -I. -DCOMPAT_IBCS2
 CLEANFILES+= vnode_if.h vnode_if.c
 
 afterinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	${.CURDIR}/ibcs2 ${DESTDIR}/usr/bin
 
 .include <bsd.kmod.mk>
diff --git a/lkm/ibcs2/ibcs2.c b/lkm/ibcs2/ibcs2.c
index 53b61368a5a5..005e10f0a36d 100644
--- a/lkm/ibcs2/ibcs2.c
+++ b/lkm/ibcs2/ibcs2.c
@@ -1,56 +1,63 @@
 /*-
  * Copyright (c) 1994 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer
  *    in this position and unchanged.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
  *    derived from this software withough specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ibcs2.c,v 1.2 1994/10/14 08:45:16 sos Exp $
+ *	$Id: ibcs2.c,v 1.3 1995/05/30 06:06:06 rgrimes Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
 #include <sys/errno.h>
 
 MOD_MISC("ibcs2_mod")
 
+int ibcs2_load   __P((struct lkm_table *, int));
+int ibcs2_unload __P((struct lkm_table *, int));
+int ibcs2_init   __P((struct lkm_table *, int, int));
+
+int
 ibcs2_load(struct lkm_table *lkmtp, int cmd)
 {
 	uprintf("ibcs2 emulator installed\n");
 	return 0;
 }
 
+int
 ibcs2_unload(struct lkm_table *lkmtp, int cmd)
 {
 	uprintf("ibcs2 emulator removed\n");
 	return 0;
 }
 
+int
 ibcs2_init(struct lkm_table *lkmtp, int cmd, int ver)
 {
 	DISPATCH(lkmtp, cmd, ver, ibcs2_load, ibcs2_unload, nosys);
 }
diff --git a/sys/modules/ibcs2/Makefile b/sys/modules/ibcs2/Makefile
index 83be90f63eb4..6069595cb6b2 100644
--- a/sys/modules/ibcs2/Makefile
+++ b/sys/modules/ibcs2/Makefile
@@ -1,16 +1,18 @@
-#	$Id: Makefile,v 1.4 1994/10/27 23:36:57 wollman Exp $
+#	Makefile,v 1.5 1994/12/11 21:27:14 wollman Exp
 
 .PATH:	${.CURDIR}/../../sys/i386/ibcs2
 KMOD=	ibcs2_mod
-SRCS= 	ibcs2.c ibcs2_dummy.c ibcs2_file.c ibcs2_ioctl.c ibcs2_ipc.c \
-	ibcs2_isc.c ibcs2_misc.c ibcs2_signal.c ibcs2_stats.c \
-	ibcs2_sysent.c ibcs2_sysi86.c ibcs2_xenix.c vnode_if.h
+SRCS=	ibcs2.c ibcs2_errno.c ibcs2_ipc.c ibcs2_stat.c ibcs2_misc.c \
+	ibcs2_fcntl.c ibcs2_signal.c ibcs2_sysent.c ibcs2_ioctl.c \
+	ibcs2_socksys.c ibcs2_util.c ibcs2_xenix.c ibcs2_xenix_sysent.c \
+	ibcs2_isc.c ibcs2_isc_sysent.c \
+	ibcs2_msg.c ibcs2_other.c ibcs2_sysi86.c ibcs2_sysvec.c vnode_if.h
 NOMAN=
 CFLAGS+= -DLKM -I. -DCOMPAT_IBCS2
 CLEANFILES+= vnode_if.h vnode_if.c
 
 afterinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 	${.CURDIR}/ibcs2 ${DESTDIR}/usr/bin
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ibcs2/ibcs2.c b/sys/modules/ibcs2/ibcs2.c
index 53b61368a5a5..005e10f0a36d 100644
--- a/sys/modules/ibcs2/ibcs2.c
+++ b/sys/modules/ibcs2/ibcs2.c
@@ -1,56 +1,63 @@
 /*-
  * Copyright (c) 1994 Søren Schmidt
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer
  *    in this position and unchanged.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
  *    derived from this software withough specific prior written permission
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: ibcs2.c,v 1.2 1994/10/14 08:45:16 sos Exp $
+ *	$Id: ibcs2.c,v 1.3 1995/05/30 06:06:06 rgrimes Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/sysent.h>
 #include <sys/lkm.h>
 #include <sys/errno.h>
 
 MOD_MISC("ibcs2_mod")
 
+int ibcs2_load   __P((struct lkm_table *, int));
+int ibcs2_unload __P((struct lkm_table *, int));
+int ibcs2_init   __P((struct lkm_table *, int, int));
+
+int
 ibcs2_load(struct lkm_table *lkmtp, int cmd)
 {
 	uprintf("ibcs2 emulator installed\n");
 	return 0;
 }
 
+int
 ibcs2_unload(struct lkm_table *lkmtp, int cmd)
 {
 	uprintf("ibcs2 emulator removed\n");
 	return 0;
 }
 
+int
 ibcs2_init(struct lkm_table *lkmtp, int cmd, int ver)
 {
 	DISPATCH(lkmtp, cmd, ver, ibcs2_load, ibcs2_unload, nosys);
 }