--- kernel/bsd/dev/ppc/conf.c	2018/04/24 18:26:02	1.1.1.1
+++ kernel/bsd/dev/ppc/conf.c	2018/04/24 18:29:35	1.1.1.2
@@ -30,12 +30,12 @@
  *
  */
 
-#import <sys/param.h>
-#import <sys/systm.h>
-#import <sys/buf.h>
-#import <sys/ioctl.h>
-#import <sys/tty.h>
-#import <sys/conf.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/ioctl.h>
+#include <sys/tty.h>
+#include <sys/conf.h>
 
 
 extern int	nulldev();
@@ -105,7 +105,7 @@ extern int tdis_open(),tdis_close(),tdis
 #endif
 
 
-#import <vol.h>
+#include <vol.h>
 #if NVOL > 0
 extern int	volopen(),volclose(),volioctl();
 #else
@@ -120,7 +120,7 @@ extern int 	mmread(),mmwrite();
 #define	mmselect	seltrue
 #define mmmmap		eno_mmap
 
-#import <pty.h>
+#include <pty.h>
 #if NPTY > 0
 extern struct tty *pt_tty[];
 extern int	ptsopen(),ptsclose(),ptsread(),ptswrite(),ptsstop(),ptsputc();
@@ -144,8 +144,6 @@ extern int	ptcopen(),ptcclose(),ptcread(
 
 extern int	logopen(),logclose(),logread(),logioctl(),logselect();
 extern int	nvopen(), nvclose(), nvread(), nvwrite();
-extern int	fdesc_open(), fdesc_read(), fdesc_write(),
-		fdesc_ioctl(), fdesc_select();
 
 extern int	seltrue();
 
@@ -230,11 +228,7 @@ struct cdevsw	cdevsw[] =
     NO_CDEVICE,								/*31*/
 
 	/* 32 - 47 are reserved to NeXT */
-    {
-	fdesc_open,	eno_opcl,	fdesc_read,	fdesc_write,	/*32*/
-	fdesc_ioctl,	eno_stop,	eno_reset,	0,		fdesc_select,
-	eno_mmap,	eno_strat,	eno_getc,	eno_putc,	0
-    },
+    NO_CDEVICE,								/*32*/
     {
 	sgopen,		sgclose,	eno_rdwrt,	eno_rdwrt,	/*33*/
 	sgioctl,	eno_stop,	eno_reset,	0,		eno_select,
@@ -262,7 +256,7 @@ struct cdevsw	cdevsw[] =
 int	nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);
 
 
-#import	<sys/vnode.h> /* for VCHR and VBLK */
+#include	<sys/vnode.h> /* for VCHR and VBLK */
 /*
  * return true if a disk
  */
@@ -334,7 +328,8 @@ chrtoblk(dev)
 /*
  * Returns true if dev is /dev/mem or /dev/kmem.
  */
-int iskmemdev(dev)
+int
+iskmemdev(dev)
 	dev_t dev;
 {