diff --git a/sys/i386/isa/atapi.c b/sys/i386/isa/atapi.c
index ccbd85ba88d4..c620b55a56fa 100644
--- a/sys/i386/isa/atapi.c
+++ b/sys/i386/isa/atapi.c
@@ -99,7 +99,7 @@
  */
 #undef DEBUG
 
-#include "wd.h"
+#include "wdc.h"
 #include "wcd.h"
 /* #include "whd.h" -- add your driver here */
 /* #include "wmt.h" -- add your driver here */
diff --git a/sys/i386/isa/wcd.c b/sys/i386/isa/wcd.c
index cc750e613309..ce4f0e05d416 100644
--- a/sys/i386/isa/wcd.c
+++ b/sys/i386/isa/wcd.c
@@ -18,7 +18,7 @@
 /*
  * The driver was tested on Toshiba XM-5302TA drive. (vak)
  */
-#include "wd.h"
+#include "wdc.h"
 #include "wcd.h"
 #if NWCD > 0 && NWDC > 0 && defined (ATAPI)
 
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index d2fd68dca4fd..66f16e0e8db6 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.82 1995/08/18 11:26:35 jkh Exp $
+ *	$Id: wd.c,v 1.83 1995/09/06 05:06:18 dyson Exp $
  */
 
 /* TODO:
@@ -56,7 +56,12 @@
  */
 
 #include "wd.h"
-#if	NWDC > 0
+#ifdef  NWDC
+#undef  NWDC
+#endif
+
+#include "wdc.h"
+#if     NWDC > 0
 
 #include <sys/param.h>
 #include <sys/dkbad.h>