diff --git a/8018x.config b/8018x.config
index e8565704a..d007eb459 100644
--- a/8018x.config
+++ b/8018x.config
@@ -89,7 +89,6 @@ CONFIG_EXEC_MMODEL=y
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_DEV_BHD is not set
 # CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_HD is not set
 # CONFIG_TRACK_CACHE is not set
 # CONFIG_IDE_PROBE is not set
 # CONFIG_BLK_DEV_RAM is not set
diff --git a/blink16.config b/blink16.config
index d8ee3b1a9..a4965beac 100644
--- a/blink16.config
+++ b/blink16.config
@@ -68,7 +68,6 @@ CONFIG_BLK_DEV_BFD=y
 CONFIG_BLK_DEV_BHD=y
 CONFIG_IDE_PROBE=y
 # CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_HD is not set
 # CONFIG_BLK_DEV_RAM is not set
 CONFIG_RAMDISK_SEGMENT=0xD000
 CONFIG_RAMDISK_SECTORS=128
diff --git a/elks/arch/i86/defconfig b/elks/arch/i86/defconfig
index e7cbe289d..8caf8d6c1 100644
--- a/elks/arch/i86/defconfig
+++ b/elks/arch/i86/defconfig
@@ -90,7 +90,6 @@ CONFIG_TRACK_CACHE=y
 CONFIG_BLK_DEV_BHD=y
 CONFIG_IDE_PROBE=y
 CONFIG_BLK_DEV_FD=y
-# CONFIG_BLK_DEV_HD is not set
 
 #
 # Additional block devices
diff --git a/elks/arch/i86/drivers/block/Makefile b/elks/arch/i86/drivers/block/Makefile
index 82c6ccc84..14451d32a 100644
--- a/elks/arch/i86/drivers/block/Makefile
+++ b/elks/arch/i86/drivers/block/Makefile
@@ -33,71 +33,47 @@ include $(BASEDIR)/Makefile-rules
 #########################################################################
 # Objects to be compiled.
 
-OBJS  = init.o genhd.o ll_rw_blk.o
-
-# BIOS floppy and/or hard drive support
-ifeq ($(CONFIG_BLK_DEV_BFD), y)
-OBJS += bioshd.o bios.o
-endif
-
-ifeq ($(CONFIG_BLK_DEV_BHD), y)
-  ifneq ($(CONFIG_BLK_DEV_BFD), y)
-    OBJS += bioshd.o bios.o
-  endif
-  ifeq ($(CONFIG_IDE_PROBE), y)
-    OBJS += idequery.o
-  endif
-endif
-
-# direct fd support
-ifeq ($(CONFIG_BLK_DEV_FD), y)
-OBJS += directfd.o
-endif
-
-ifeq ($(CONFIG_BLK_DEV_RAM), y)
-OBJS += rd.o
+OBJS  = init.o ll_rw_blk.o genhd.o hdinfo.o
+OBJS += bioshd.o bios.o             # CONFIG_BLK_DEV_BFD / CONFIG_BLK_DEV_BHD
+OBJS += ata.o ata-cf.o              # CONFIG_BLK_DEV_ATA_CF
+OBJS += rd.o                        # CONFIG_BLK_DEV_RAM
+OBJS += idequery.o                  # CONFIG_IDE_PROBE
+OBJS += romflash.o                  # CONFIG_ROMFS_FS
+
+ifdef CONFIG_ASYNCIO
+OBJS += directfd.o                  # CONFIG_BLK_DEV_FD
 endif
 
-ifeq ($(CONFIG_ROMFS_FS), y)
-OBJS += romflash.o
+ifdef CONFIG_ARCH_IBMPC
+OBJS += mfmhd.o                     # CONFIG_BLK_DEV_MFMHD
 endif
 
-ifeq ($(CONFIG_FS_XMS), y)
-  ifeq ($(CONFIG_FS_XMS_RAMDISK), y)
+#
+# SSD driver
+#
+ifdef CONFIG_FS_XMS
+  ifdef CONFIG_FS_XMS_RAMDISK
     OBJS += ssd.o ssd-xms.o
   endif
 endif
 
-ifeq ($(CONFIG_BLK_DEV_SSD_TEST), y)
+ifdef CONFIG_BLK_DEV_SSD_TEST
 OBJS += ssd.o ssd-test.o
 endif
 
-ifeq ($(CONFIG_BLK_DEV_SSD_SD), y)
-  ifeq ($(CONFIG_ARCH_NECV25), y)
-    ifeq ($(CONFIG_HW_SPI), y)
+ifdef CONFIG_BLK_DEV_SSD_SD
+  ifdef CONFIG_ARCH_NECV25
+    ifdef CONFIG_HW_SPI
       OBJS += ssd.o ssd-sd.o spi-hw-necv25.o
     else
       OBJS += ssd.o ssd-sd.o spi-necv25.o
     endif
   endif
-  ifeq ($(CONFIG_ARCH_8018X), y)
+  ifdef CONFIG_ARCH_8018X
     OBJS += ssd.o ssd-sd.o spi-8018x.o
   endif
 endif
 
-ifeq ($(CONFIG_BLK_DEV_ATA_CF), y)
-OBJS += ata.o ata-cf.o
-endif
-
-ifeq ($(CONFIG_BLK_DEV_MFMHD), y)
-OBJS += mfmhd.o
-endif
-
-# experimental (and not working) direct hd support
-ifeq ($(CONFIG_BLK_DEV_HD), y)
-OBJS += directhd.o
-endif
-
 #########################################################################
 # Commands.
 
diff --git a/elks/arch/i86/drivers/block/genhd.c b/elks/arch/i86/drivers/block/genhd.c
index d6f06978a..6ab3666f7 100644
--- a/elks/arch/i86/drivers/block/genhd.c
+++ b/elks/arch/i86/drivers/block/genhd.c
@@ -29,9 +29,6 @@
 #include <arch/system.h>
 #include "blk.h"
 
-#if defined(CONFIG_BLK_DEV_BHD) || defined(CONFIG_BLK_DEV_ATA_CF) || \
-    defined(CONFIG_BLK_DEV_MFMHD)
-
 #define NR_SECTS(p)     p->nr_sects
 #define START_SECT(p)   p->start_sect
 
@@ -363,63 +360,3 @@ void GENPROC init_partitions(struct gendisk *hd)
         check_partition(hd, MKDEV(hd->major, first_minor));
     }
 }
-#endif /* CONFIG_BLK_DEV_BHD || CONFIG_BLK_DEV_ATA_CF || CONFIG_BLK_DEV_MFMHD */
-
-#if defined(CONFIG_BLK_DEV_BFD) || defined(CONFIG_BLK_DEV_BHD) || \
-    defined(CONFIG_BLK_DEV_ATA_CF) || defined(CONFIG_BLK_DEV_MFMHD)
-
-int ioctl_hdio_geometry(struct gendisk *hd, kdev_t dev, struct hd_geometry *loc)
-{
-    unsigned short minor = MINOR(dev);
-    int drive = minor >> hd->minor_shift;
-    struct drive_infot *drivep;
-    int err;
-
-    drivep = &hd->drive_info[drive];
-    err = verify_area(VERIFY_WRITE, (void *)loc, sizeof(struct hd_geometry));
-    if (!err) {
-        put_user_char(drivep->heads, &loc->heads);
-        put_user_char(drivep->sectors, &loc->sectors);
-        put_user(drivep->cylinders, &loc->cylinders);
-        put_user_long(hd->part[minor].start_sect, &loc->start);
-    }
-    return err;
-}
-
-void GENPROC show_drive_info(struct drive_infot *drivep, const char *name, int drive,
-    int count, const char *eol)
-{
-    unsigned long size;
-    char *unit;
-    static char UNITS[4] = "KMGT";
-
-    for (; count; count--, drive++) {
-        if (drivep->cylinders != 0) {
-            unit = UNITS;
-            size = (unsigned long)drivep->sectors * 5;  /* 0.1 kB units */
-            if (drivep->sector_size == 1024)
-                size <<= 1;
-            size *= ((unsigned long) drivep->cylinders) * drivep->heads;
-
-            /* Select appropriate unit */
-            while (size > 99999 && unit[1]) {
-                debug("DBG: Size = %lu (%X/%X)\n", size, *unit, unit[1]);
-                size += 512;
-                size /= 1024U;
-                unit++;
-            }
-            debug("DBG: Size = %lu (%X/%X)\n",size,*unit,unit[1]);
-            printk("%s%c: %4lu%c CHS %3u,%2d,%d",
-                name, drive + (drivep->fdtype < 0? 'a' : '0'), (size/10), *unit,
-                drivep->cylinders, drivep->heads, drivep->sectors);
-#ifdef CONFIG_ARCH_IBMPC
-            /* IBM BIOS INT 13 can't use HD drives > 528MB, must use ATA/CF driver */
-            if (drivep->cylinders > 1024 && name[0] == 'h')
-                printk(" (CYL > 1024, must use /dev/cf%c)", drive+'a');
-#endif
-            printk("%s", eol);
-        }
-        drivep++;
-    }
-}
-#endif
diff --git a/elks/arch/i86/drivers/block/hdinfo.c b/elks/arch/i86/drivers/block/hdinfo.c
new file mode 100644
index 000000000..78efdca19
--- /dev/null
+++ b/elks/arch/i86/drivers/block/hdinfo.c
@@ -0,0 +1,59 @@
+#include <linuxmt/config.h>
+#include <linuxmt/genhd.h>
+#include <linuxmt/mm.h>
+#include <linuxmt/debug.h>
+
+int ioctl_hdio_geometry(struct gendisk *hd, kdev_t dev, struct hd_geometry *loc)
+{
+    unsigned short minor = MINOR(dev);
+    int drive = minor >> hd->minor_shift;
+    struct drive_infot *drivep;
+    int err;
+
+    drivep = &hd->drive_info[drive];
+    err = verify_area(VERIFY_WRITE, (void *)loc, sizeof(struct hd_geometry));
+    if (!err) {
+        put_user_char(drivep->heads, &loc->heads);
+        put_user_char(drivep->sectors, &loc->sectors);
+        put_user(drivep->cylinders, &loc->cylinders);
+        put_user_long(hd->part[minor].start_sect, &loc->start);
+    }
+    return err;
+}
+
+void GENPROC show_drive_info(struct drive_infot *drivep, const char *name, int drive,
+    int count, const char *eol)
+{
+    unsigned long size;
+    char *unit;
+    static char UNITS[4] = "KMGT";
+
+    for (; count; count--, drive++) {
+        if (drivep->cylinders != 0) {
+            unit = UNITS;
+            size = (unsigned long)drivep->sectors * 5;  /* 0.1 kB units */
+            if (drivep->sector_size == 1024)
+                size <<= 1;
+            size *= ((unsigned long) drivep->cylinders) * drivep->heads;
+
+            /* Select appropriate unit */
+            while (size > 99999 && unit[1]) {
+                debug("DBG: Size = %lu (%X/%X)\n", size, *unit, unit[1]);
+                size += 512;
+                size /= 1024U;
+                unit++;
+            }
+            debug("DBG: Size = %lu (%X/%X)\n",size,*unit,unit[1]);
+            printk("%s%c: %4lu%c CHS %3u,%2d,%d",
+                name, drive + (drivep->fdtype < 0? 'a' : '0'), (size/10), *unit,
+                drivep->cylinders, drivep->heads, drivep->sectors);
+#ifdef CONFIG_ARCH_IBMPC
+            /* IBM BIOS INT 13 can't use HD drives > 528MB, must use ATA/CF driver */
+            if (drivep->cylinders > 1024 && name[0] == 'h')
+                printk(" (CYL > 1024, must use /dev/cf%c)", drive+'a');
+#endif
+            printk("%s", eol);
+        }
+        drivep++;
+    }
+}
diff --git a/elks/arch/i86/drivers/block/ll_rw_blk.c b/elks/arch/i86/drivers/block/ll_rw_blk.c
index 9fea1076b..4e92b6cf6 100644
--- a/elks/arch/i86/drivers/block/ll_rw_blk.c
+++ b/elks/arch/i86/drivers/block/ll_rw_blk.c
@@ -367,10 +367,6 @@ void INITPROC blk_dev_init(void)
     rd_init();          /* RAMDISK block device*/
 #endif
 
-#ifdef CONFIG_BLK_DEV_HD
-    struct gendisk *hddisk = directhd_init();
-#endif
-
 #ifdef CONFIG_BLK_DEV_MFMHD
     struct gendisk *mfmdisk = mfmhd_init();
 #endif
diff --git a/elks/arch/i86/drivers/block/mfmhd.c b/elks/arch/i86/drivers/block/mfmhd.c
index 1f9ec24c2..7b9e6afb6 100644
--- a/elks/arch/i86/drivers/block/mfmhd.c
+++ b/elks/arch/i86/drivers/block/mfmhd.c
@@ -2320,14 +2320,14 @@ void mfmhd_park_all(void)
          * each with an actuator of its own, so park the pair.
          */
         if (drive == 0 && drive_info[drive].source == MFM_GEO_SRC_FILECARD20) {
-            mfmhd_seek_unit(MFMHD_PORT, drive, 0,
+            mfmhd_seek_unit(mfm_port, drive, 0,
                 MFM_FILECARD20_UNIT_CYLINDERS - 1);
-            mfmhd_seek_unit(MFMHD_PORT, drive, 1,
+            mfmhd_seek_unit(mfm_port, drive, 1,
                 MFM_FILECARD20_UNIT_CYLINDERS - 1);
             continue;
         }
 
-        mfmhd_seek_unit(MFMHD_PORT, drive, (unsigned int)drive & 1U,
+        mfmhd_seek_unit(mfm_port, drive, (unsigned int)drive & 1U,
             drive_info[drive].cylinders - 1);    /* cylinders are zero based */
     }
 }
diff --git a/elks/arch/i86/drivers/block/directhd.c b/elks/arch/i86/drivers/block/unused/directhd.c
similarity index 100%
rename from elks/arch/i86/drivers/block/directhd.c
rename to elks/arch/i86/drivers/block/unused/directhd.c
diff --git a/elks/arch/i86/drivers/block/dma.c b/elks/arch/i86/drivers/block/unused/dma.c
similarity index 100%
rename from elks/arch/i86/drivers/block/dma.c
rename to elks/arch/i86/drivers/block/unused/dma.c
diff --git a/elks/arch/i86/drivers/block/ssd_asm.S b/elks/arch/i86/drivers/block/unused/ssd_asm.S
similarity index 100%
rename from elks/arch/i86/drivers/block/ssd_asm.S
rename to elks/arch/i86/drivers/block/unused/ssd_asm.S
diff --git a/elks/arch/i86/drivers/char/Makefile b/elks/arch/i86/drivers/char/Makefile
index c5fc3bb14..b025cfb72 100644
--- a/elks/arch/i86/drivers/char/Makefile
+++ b/elks/arch/i86/drivers/char/Makefile
@@ -35,63 +35,39 @@ include $(BASEDIR)/Makefile-rules
 #########################################################################
 # Objects to be compiled.
 
-OBJS  = init.o mem.o ntty.o tcpdev.o pty.o lp.o
-
-ifeq ($(CONFIG_ETH), y)
-    OBJS += eth.o
-endif
-
-ifeq ($(CONFIG_ARCH_IBMPC), y)
-	CONIO = bios
-	SERIAL = 8250
-endif
-
-ifeq ($(CONFIG_ARCH_PC98), y)
-	SERIAL = pc98
-endif
-
-ifeq ($(CONFIG_ARCH_8018X), y)
-	CONIO = 8018x
-	SERIAL = template
-endif
-
-ifeq ($(CONFIG_ARCH_NECV25), y)
-	CONIO = necv25
-	SERIAL = template
-endif
-
-ifeq ($(CONFIG_ARCH_SWAN), y)
-	CONIO = swan
-	SERIAL = swan
-endif
-
-ifeq ($(CONFIG_ARCH_SOLO86), y)
-	CONIO = solo86
-    SERIAL = template
-endif
-
-ifdef CONFIG_CONSOLE_BIOS
-OBJS += console-bios.o console-bios-asm.o bell-8254.o
-endif
-
-ifdef CONFIG_CONSOLE_8018X
-OBJS += console-serial-8018x.o
-endif
-
-ifdef CONFIG_CONSOLE_NECV25
-OBJS += console-serial-necv25.o serfast.o
-endif
+OBJS  = init.o ntty.o
+OBJS += pty.o                               # CONFIG_PSEUDO_TTY
+OBJS += mem.o                               # CONFIG_CHAR_DEV_MEM
+OBJS += lp.o                                # CONFIG_CHAR_DEV_LP
+OBJS += eth.o                               # CONFIG_ETH
+OBJS += tcpdev.o                            # CONFIG_INET
+OBJS += audio-sb.o audio-mad.o              # CONFIG_AUDIO_SB
+OBJS += mouse-ps2.o                         # CONFIG_MOUSE_PS2
 
+#
+# Platform-dependent console, keyboard and serial
+#
 ifdef CONFIG_ARCH_IBMPC
   ifdef CONFIG_CONSOLE_DIRECT
     OBJS += console-direct.o bell-8254.o
   endif
+  ifdef CONFIG_CONSOLE_BIOS
+    OBJS += console-bios.o console-bios-asm.o bell-8254.o
+  endif
   ifdef CONFIG_CONSOLE_AMSTRAD_IGA
     OBJS += console-direct-amstrad.o bell-8254.o
   endif
-  ifdef CONFIG_CONSOLE_DUAL
-    OBJS += crtc-6845.o
+  ifdef CONFIG_CONSOLE_HEADLESS
+    OBJS += console-headless.o
   endif
+  ifdef CONFIG_KEYBOARD_SCANCODE
+    OBJS += kbd-scancode.o
+  else
+    OBJS += kbd-poll.o conio-bios.o
+  endif
+OBJS += crtc-6845.o                         # CONFIG_CONSOLE_DUAL
+OBJS += audio-8254.o                        # CONFIG_AUDIO
+OBJS += serial-8250.o serfast.o             # CONFIG_CHAR_DEV_RS
 endif
 
 ifdef CONFIG_ARCH_PC98
@@ -99,52 +75,28 @@ ifdef CONFIG_ARCH_PC98
     OBJS += console-direct-pc98.o
   endif
 OBJS += conio-pc98.o conio-pc98-asm.o kbd-poll-pc98.o
-endif
-
-ifdef CONFIG_ARCH_SWAN
-  ifdef CONFIG_CONSOLE_DIRECT
-    OBJS += console-direct-swan.o console-font-4x8-swan.o console-font-8x8-swan.o
-  endif
-OBJS += kbd-poll.o conio-$(CONIO).o bell-swan.o
+OBJS += serial-pc98.o
 endif
 
 ifdef CONFIG_ARCH_SOLO86
-OBJS += kbd-poll.o conio-$(CONIO).o
-endif
-
-ifdef CONFIG_ARCH_IBMPC
-  ifdef CONFIG_KEYBOARD_SCANCODE
-    OBJS += kbd-scancode.o
-  else
-    OBJS += kbd-poll.o conio-$(CONIO).o
-  endif
+OBJS += console-headless.o conio-solo86.o kbd-poll.o
 endif
 
-ifdef CONFIG_CONSOLE_HEADLESS
-OBJS += console-headless.o
-endif
-
-ifdef CONFIG_CHAR_DEV_RS
-	OBJS += serial-$(SERIAL).o
-	ifdef CONFIG_ARCH_IBMPC
-		OBJS += serfast.o
-	endif
-endif
-
-ifdef CONFIG_AUDIO
-  OBJS += audio-8254.o
-endif
-
-ifdef CONFIG_CHAR_DEV_DSP
-  OBJS += audio-sb.o audio-mad.o
+ifdef CONFIG_CONSOLE_8018X
+OBJS += console-serial-8018x.o conio-8018x.o
 endif
 
-ifdef CONFIG_ARCH_IBMPC
-  OBJS += mouse-ps2.o
+ifdef CONFIG_CONSOLE_NECV25
+OBJS += conio-necv25.o
+OBJS += console-serial-necv25.o serfast.o
 endif
 
-ifdef CONFIG_CHAR_DEV_CGATEXT
-	OBJS += cgatext.o
+ifdef CONFIG_ARCH_SWAN
+  ifdef CONFIG_CONSOLE_DIRECT
+    OBJS += console-direct-swan.o console-font-4x8-swan.o console-font-8x8-swan.o
+  endif
+OBJS += kbd-poll.o conio-swan.o bell-swan.o
+OBJS += serial-swan.o
 endif
 
 #########################################################################
diff --git a/elks/arch/i86/drivers/char/config.in b/elks/arch/i86/drivers/char/config.in
index 77c5645a6..50507ed18 100644
--- a/elks/arch/i86/drivers/char/config.in
+++ b/elks/arch/i86/drivers/char/config.in
@@ -43,7 +43,6 @@ mainmenu_option next_comment
 		define_bool CONFIG_CHAR_DEV_RS y
 	fi
 	bool 'Parallel device driver'		CONFIG_CHAR_DEV_LP	  y
-	#bool 'CGA text mode videobuffer'	CONFIG_CHAR_DEV_CGATEXT	  n
 	bool 'Memory character devices'		CONFIG_CHAR_DEV_MEM	  y
 	#if [ "$CONFIG_CHAR_DEV_MEM" = "y" ]; then
 		#bool '  Port read'	CONFIG_CHAR_DEV_MEM_PORT_READ	n
diff --git a/elks/arch/i86/drivers/char/crtc-6845.c b/elks/arch/i86/drivers/char/crtc-6845.c
index ad40a3084..7c8df657b 100644
--- a/elks/arch/i86/drivers/char/crtc-6845.c
+++ b/elks/arch/i86/drivers/char/crtc-6845.c
@@ -45,7 +45,6 @@ struct hw_params crtc_params[N_DEVICETYPES] = {
 /* Check to see if this CRTC is present */
 int INITPROC crtc_probe(unsigned short crtc_base)
 {
-    int i;
     unsigned char test = 0x55;
     unsigned char original, value;
 
diff --git a/elks/arch/i86/drivers/char/init.c b/elks/arch/i86/drivers/char/init.c
index c4fc01d3a..bc13abed5 100644
--- a/elks/arch/i86/drivers/char/init.c
+++ b/elks/arch/i86/drivers/char/init.c
@@ -8,10 +8,6 @@ void INITPROC chr_dev_init(void)
     lp_init();
 #endif
 
-#ifdef CONFIG_CHAR_DEV_CGATEXT
-    cgatext_init();
-#endif
-
 #ifdef CONFIG_CHAR_DEV_MEM
     mem_dev_init();
 #endif
diff --git a/elks/arch/i86/drivers/char/mouse-ps2.c b/elks/arch/i86/drivers/char/mouse-ps2.c
index 855bda006..ff7ee5d23 100644
--- a/elks/arch/i86/drivers/char/mouse-ps2.c
+++ b/elks/arch/i86/drivers/char/mouse-ps2.c
@@ -17,8 +17,6 @@
 #include <arch/io.h>
 #include <arch/irq.h>
 
-#ifdef CONFIG_MOUSE_PS2
-
 #define IRQ_MOUSE       12          /* mouse interrupt, may conflict with networking */
 #define MAX_RETRIES     60
 
@@ -177,4 +175,3 @@ struct tty_ops ps2_mouse_ops = {
     ps2_ioctl,
     NULL
 };
-#endif
diff --git a/elks/arch/i86/drivers/char/cgatext.c b/elks/arch/i86/drivers/char/unused/cgatext.c
similarity index 100%
rename from elks/arch/i86/drivers/char/cgatext.c
rename to elks/arch/i86/drivers/char/unused/cgatext.c
diff --git a/elks/include/arch/cgatext.h b/elks/arch/i86/drivers/char/unused/cgatext.h
similarity index 100%
rename from elks/include/arch/cgatext.h
rename to elks/arch/i86/drivers/char/unused/cgatext.h
diff --git a/elks/arch/i86/drivers/net/Makefile b/elks/arch/i86/drivers/net/Makefile
index 7878d513e..e73893653 100644
--- a/elks/arch/i86/drivers/net/Makefile
+++ b/elks/arch/i86/drivers/net/Makefile
@@ -25,24 +25,14 @@ NOINDENT	=
 include $(BASEDIR)/Makefile-rules
 
 #########################################################################
-# Specific rules.
+# Objects to be compiled.
 
 OBJS =
-ifeq ($(CONFIG_ETH_NE2K), y)
-OBJS += ne2k-asm.o ne2k.o
-endif
-ifeq ($(CONFIG_ETH_WD), y)
-OBJS += wd.o
-endif
-ifeq ($(CONFIG_ETH_EL3), y)
-OBJS += el3-asm.o el3.o
-endif
-ifeq ($(CONFIG_ETH_ULTRA), y)
-OBJS += ultra.o
-endif
-ifeq ($(CONFIG_ETH_PCNET), y)
-OBJS += pcnet.o pcnet-asm.o
-endif
+OBJS += ne2k-asm.o ne2k.o           # CONFIG_ETH_NE2K
+OBJS += wd.o                        # CONFIG_ETH_WD
+OBJS += el3-asm.o el3.o             # CONFIG_ETH_EL3
+OBJS += ultra.o                     # CONFIG_ETH_ULTRA
+OBJS += pcnet.o pcnet-asm.o         # CONFIG_ETH_PCNET
 
 all: net_drv.a
 
diff --git a/elks/arch/i86/kernel/system-swan.c b/elks/arch/i86/kernel/system-swan.c
index 3e3e186ab..c00de7ba3 100644
--- a/elks/arch/i86/kernel/system-swan.c
+++ b/elks/arch/i86/kernel/system-swan.c
@@ -21,7 +21,7 @@ unsigned char arch_cpu; /* CPU type from cputype.S */
 
 unsigned int INITPROC setup_arch(void)
 {
-    unsigned int heapofs, heapsegs;
+    unsigned int heapofs;
 
     /*
      * Set membase to beginning of available main memory.
@@ -56,4 +56,4 @@ void INITPROC kernel_banner_arch(void) {
             printk("WonderSwan Color, ");
     } else
         printk("WonderSwan, ");
-}
\ No newline at end of file
+}
diff --git a/elks/include/arch/ports.h b/elks/include/arch/ports.h
index 77b4cb8e0..dd30271f8 100644
--- a/elks/include/arch/ports.h
+++ b/elks/include/arch/ports.h
@@ -14,7 +14,7 @@
  *  3   Com2    (/dev/ttyS1) CONFIG_CHAR_DEV_RS     Optional
  *  4   Com1    (/dev/ttyS0) CONFIG_CHAR_DEV_RS     Optional
  *  5*  Com3    (/dev/ttyS2) CONFIG_CHAR_DEV_RS     Optional
- *  5*  HW IDE hard drive    CONFIG_BLK_DEV_HD      Non-working directhd.c
+ *  5*  HW IDE hard drive
  *  5*  Sound Blaster (dsp)  CONFIG_CHAR_DEV_DSP    Optional, avoid if a HD is fitted
  *  6   HW floppy drive      CONFIG_BLK_DEV_FD      Optional
  *  7   Unused (LPT, Com4)
@@ -26,8 +26,8 @@
  * 12*  NE2K      (/dev/ne0) CONFIG_ETH_NE2K        Optional
  * 12*  Unused (Mouse)                              No driver
  * 13   Unused (Math coproc)                        No driver
- * 14   AT HD IDE (/dev/hda) CONFIG_BLK_DEV_HD      Non-working hd.c
- * 15   AT HD IDE (/dev/hdb) CONFIG_BLK_DEV_HD      Non-working hd.c
+ * 14   AT IDE hard drive
+ * 15   AT IDE hard drive
  *
  * Edit settings below to change port address or IRQ:
  *   Change I/O port and driver IRQ number to match your hardware
@@ -190,14 +190,11 @@ struct isa_conf {
 /* bioshd.c*/
 #define FDC_DOR         0x3F2           /* floppy digital output register*/
 
-/* obsolete - experimental IDE hard drive, directhd.c (broken)*/
-#define HD1_PORT        0x1f0
-#define HD2_PORT        0x170
-#define HD_IRQ          5               /* missing request_irq call*/
-#define HD1_AT_IRQ      14              /* missing request_irq call*/
-#define HD2_AT_IRQ      15              /* missing request_irq call*/
-
 /* direct floppy driver, directfd.c */
 #define FLOPPY_IRQ      6
 
+/* idequery.c */
+#define HD1_PORT        0x1f0
+#define HD2_PORT        0x170
+
 #endif
diff --git a/elks/include/linuxmt/audio.h b/elks/include/linuxmt/audio.h
index a34b4cb5e..127633401 100644
--- a/elks/include/linuxmt/audio.h
+++ b/elks/include/linuxmt/audio.h
@@ -1,3 +1,6 @@
+#ifndef __LINUXMT_AUDIO_H
+#define __LINUXMT_AUDIO_H
+
 /*
  * /dev/dsp audio ioctl definitions.
  *
@@ -16,9 +19,6 @@
  * The ioctl numbers and encoding follow the Linux 2.x OSS sound interface.
  */
 
-#ifndef __LINUXMT_AUDIO_H
-#define __LINUXMT_AUDIO_H
-
 #include <linuxmt/types.h>
 
 /*
diff --git a/elks/init/main.c b/elks/init/main.c
index 9c8ea74fa..fdf0457a9 100644
--- a/elks/init/main.c
+++ b/elks/init/main.c
@@ -497,12 +497,7 @@ static void INITPROC comirq(char *line)
 #endif
 }
 
-/*
- * irq,port,ram,flags for any ISA card; ram is the DMA channel on an audio
- * card.  "off" sets the port to -1, which is how a driver is told to skip
- * its card; port 0 is left alone, as the LANCE driver reads it as a request
- * to autoconfigure.
- */
+/* irq,port,ram,flags for any ISA card; ram is the DMA channel on an audio card */
 static void INITPROC parse_isaopts(char *line, struct isa_conf *parms)
 {
     char *p;
diff --git a/emu86-disk.config b/emu86-disk.config
index 515c9407b..569ddffcb 100644
--- a/emu86-disk.config
+++ b/emu86-disk.config
@@ -65,7 +65,6 @@ CONFIG_TRACK_CACHE=y
 CONFIG_BLK_DEV_BHD=y
 CONFIG_IDE_PROBE=y
 # CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_RAM=y
 CONFIG_RAMDISK_SEGMENT=0
 CONFIG_RAMDISK_SECTORS=128
diff --git a/emu86-rom-full.config b/emu86-rom-full.config
index 26c9f5e9e..7626344eb 100644
--- a/emu86-rom-full.config
+++ b/emu86-rom-full.config
@@ -87,7 +87,6 @@ CONFIG_BLK_DEV_BFD=y
 CONFIG_BLK_DEV_BHD=y
 # CONFIG_IDE_PROBE is not set
 # CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_HD is not set
 # CONFIG_BLK_DEV_RAM is not set
 CONFIG_BLK_DEV_CHAR=y
 
diff --git a/emu86-rom.config b/emu86-rom.config
index fc41892c6..45812f5f2 100644
--- a/emu86-rom.config
+++ b/emu86-rom.config
@@ -83,7 +83,6 @@ CONFIG_ROMFS_BASE=8000
 # CONFIG_BLK_DEV_FD is not set
 # CONFIG_BLK_DEV_BHD is not set
 # CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_HD is not set
 # CONFIG_BLK_DEV_RAM is not set
 CONFIG_BLK_DEV_CHAR=y
 
diff --git a/image/Make.devices b/image/Make.devices
index f4d98869e..e1e125aa1 100755
--- a/image/Make.devices
+++ b/image/Make.devices
@@ -188,12 +188,6 @@ endif
 	$(MKDEV) /dev/ul0 c 9 3
 	$(MKDEV) /dev/le0 c 9 4
 
-##############################################################################
-# CGATEXT
-ifdef CONFIG_CHAR_DEV_CGATEXT
-	$(MKDEV) /dev/cgatext	c 10 0
-endif
-
 ##############################################################################
 # ROM / Flash memory card
 
diff --git a/solo86-rom-full.config b/solo86-rom-full.config
index 99ccb27c8..229385417 100644
--- a/solo86-rom-full.config
+++ b/solo86-rom-full.config
@@ -84,7 +84,6 @@ CONFIG_FS_NR_EXT_BUFFERS=32
 # CONFIG_BLK_DEV_BHD is not set
 # CONFIG_IDE_PROBE is not set
 # CONFIG_BLK_DEV_FD is not set
-# CONFIG_BLK_DEV_HD is not set
 # CONFIG_BLK_DEV_RAM is not set
 CONFIG_BLK_DEV_ATA_CF=y
 CONFIG_BLK_DEV_CHAR=y