diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index c9d92f4bbfa8..30914d017355 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -35,9 +35,6 @@
  * $FreeBSD$
  */
 
-#include "npx.h"
-#if NNPX > 0
-
 #include "opt_debug_npx.h"
 #include "opt_math_emulate.h"
 
@@ -929,5 +926,3 @@ static devclass_t npx_devclass;
  * doesn't describe the processor as being `on isa'.
  */
 DRIVER_MODULE(npx, nexus, npx_driver, npx_devclass, 0, 0);
-
-#endif /* NNPX > 0 */
diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c
index c9d92f4bbfa8..30914d017355 100644
--- a/sys/amd64/isa/npx.c
+++ b/sys/amd64/isa/npx.c
@@ -35,9 +35,6 @@
  * $FreeBSD$
  */
 
-#include "npx.h"
-#if NNPX > 0
-
 #include "opt_debug_npx.h"
 #include "opt_math_emulate.h"
 
@@ -929,5 +926,3 @@ static devclass_t npx_devclass;
  * doesn't describe the processor as being `on isa'.
  */
 DRIVER_MODULE(npx, nexus, npx_driver, npx_devclass, 0, 0);
-
-#endif /* NNPX > 0 */
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index 1c14f8e4084b..9acef11066c0 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -62,7 +62,6 @@
 
 #include "pci.h"
 #include "lnc.h"
-#if NLNC > 0
 
 #include "opt_inet.h"
 
@@ -2021,5 +2020,3 @@ mbuf_dump_chain(struct mbuf * m)
 	} while ((m = m->m_next) != NULL);
 }
 #endif
-
-#endif
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index e4da168e3807..923ec0f8fc74 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -45,7 +45,6 @@
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
 #include "mcd.h"
-#if NMCD > 0
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
@@ -1832,5 +1831,3 @@ mcd_resume(int unit)
 		return EINVAL;
 	return mcd_play(unit, &cd->lastpb);
 }
-
-#endif /* NMCD > 0 */
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index 332e020333d8..5dd8376702c8 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -45,7 +45,6 @@
  */
 
 #include "mse.h"
-#if NMSE > 0
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
@@ -767,5 +766,3 @@ mse_getati(port, dx, dy, but)
 	outb(port + MSE_PORTA, MSE_INPORT_MODE);
 	outb(port + MSE_PORTB, MSE_INPORT_INTREN);
 }
-
-#endif /* NMSE */
diff --git a/sys/i386/bios/mca_machdep.c b/sys/i386/bios/mca_machdep.c
index 8c416cf43917..6b71206394ff 100644
--- a/sys/i386/bios/mca_machdep.c
+++ b/sys/i386/bios/mca_machdep.c
@@ -26,9 +26,6 @@
  * $FreeBSD$
  */
 
-#include "mca.h"
-#if NMCA > 0
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -159,4 +156,3 @@ mca_bus_nmi (void)
 
 	return (retval);
 }
-#endif
diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c
index bcb344a7abc5..a819cddbbd6a 100644
--- a/sys/i386/isa/asc.c
+++ b/sys/i386/isa/asc.c
@@ -38,7 +38,6 @@
  */
 
 #include "asc.h"
-#if NASC > 0
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
@@ -877,5 +876,3 @@ ascpoll(dev_t dev, int events, struct proc *p)
     splx(sps);
     return 0;
 }
-
-#endif /* NASC > 0 */
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index 462ca2883a57..2aaa5aa6a2e5 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -109,7 +109,6 @@
  */
 
 #include "ctx.h"
-#if NCTX > 0
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -449,5 +448,3 @@ waitvb(int port)
 
 	return (0);
 }
-
-#endif				/* NCTX > 0 */
diff --git a/sys/i386/isa/cx.c b/sys/i386/isa/cx.c
index 9240be577e23..3bca982abb51 100644
--- a/sys/i386/isa/cx.c
+++ b/sys/i386/isa/cx.c
@@ -21,7 +21,6 @@
 #undef DEBUG
 
 #include "cx.h"
-#if NCX > 0
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -954,4 +953,3 @@ SYSINIT(cxdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,cx_drvinit,NULL)
 
 
 #endif
-#endif /* NCX */
diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c
index f7b8253e7a23..f78ddd69eb2a 100644
--- a/sys/i386/isa/gpib.c
+++ b/sys/i386/isa/gpib.c
@@ -21,10 +21,6 @@
  */
 /*Please read the README file for usage information*/
 
-#include "gp.h"
-
-#if NGP > 0
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
@@ -1160,5 +1156,3 @@ outb(CDOR,95); /*untalk*/
 
 
 }
-
-#endif /* NGPIB > 0 */
diff --git a/sys/i386/isa/gsc.c b/sys/i386/isa/gsc.c
index 3b3f0f3c8a43..77626767d644 100644
--- a/sys/i386/isa/gsc.c
+++ b/sys/i386/isa/gsc.c
@@ -36,7 +36,6 @@
  */
 
 #include "gsc.h"
-#if NGSC > 0
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
@@ -830,5 +829,3 @@ gscioctl (dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
   default: return ENOTTY;
   }
 }
-
-#endif /* NGSC > 0 */
diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index 620649545287..ff910dda1bab 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.c
@@ -36,7 +36,6 @@
  */
 
 #include "le.h"
-#if NLE > 0
 #include "opt_inet.h"
 #include "opt_ipx.h"
 
@@ -2037,4 +2036,3 @@ lance_tx_intr(
     return xmits;
 }
 #endif /* !defined(LE_NOLANCE) */
-#endif /* NLE > 0 */
diff --git a/sys/i386/isa/if_lnc.c b/sys/i386/isa/if_lnc.c
index 1c14f8e4084b..9acef11066c0 100644
--- a/sys/i386/isa/if_lnc.c
+++ b/sys/i386/isa/if_lnc.c
@@ -62,7 +62,6 @@
 
 #include "pci.h"
 #include "lnc.h"
-#if NLNC > 0
 
 #include "opt_inet.h"
 
@@ -2021,5 +2020,3 @@ mbuf_dump_chain(struct mbuf * m)
 	} while ((m = m->m_next) != NULL);
 }
 #endif
-
-#endif
diff --git a/sys/i386/isa/mca_machdep.c b/sys/i386/isa/mca_machdep.c
index 8c416cf43917..6b71206394ff 100644
--- a/sys/i386/isa/mca_machdep.c
+++ b/sys/i386/isa/mca_machdep.c
@@ -26,9 +26,6 @@
  * $FreeBSD$
  */
 
-#include "mca.h"
-#if NMCA > 0
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -159,4 +156,3 @@ mca_bus_nmi (void)
 
 	return (retval);
 }
-#endif
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index e4da168e3807..923ec0f8fc74 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/mcd.c
@@ -45,7 +45,6 @@
 static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
 #include "mcd.h"
-#if NMCD > 0
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
@@ -1832,5 +1831,3 @@ mcd_resume(int unit)
 		return EINVAL;
 	return mcd_play(unit, &cd->lastpb);
 }
-
-#endif /* NMCD > 0 */
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index 332e020333d8..5dd8376702c8 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -45,7 +45,6 @@
  */
 
 #include "mse.h"
-#if NMSE > 0
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
@@ -767,5 +766,3 @@ mse_getati(port, dx, dy, but)
 	outb(port + MSE_PORTA, MSE_INPORT_MODE);
 	outb(port + MSE_PORTB, MSE_INPORT_INTREN);
 }
-
-#endif /* NMSE */
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index c9d92f4bbfa8..30914d017355 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -35,9 +35,6 @@
  * $FreeBSD$
  */
 
-#include "npx.h"
-#if NNPX > 0
-
 #include "opt_debug_npx.h"
 #include "opt_math_emulate.h"
 
@@ -929,5 +926,3 @@ static devclass_t npx_devclass;
  * doesn't describe the processor as being `on isa'.
  */
 DRIVER_MODULE(npx, nexus, npx_driver, npx_devclass, 0, 0);
-
-#endif /* NNPX > 0 */
diff --git a/sys/i386/isa/spigot.c b/sys/i386/isa/spigot.c
index bea8ec33967b..cdb05b72d54a 100644
--- a/sys/i386/isa/spigot.c
+++ b/sys/i386/isa/spigot.c
@@ -47,7 +47,6 @@
  */
 
 #include	"spigot.h"
-#if NSPIGOT > 0
 
 #if NSPIGOT > 1
 error "Can only have 1 spigot configured."
@@ -278,5 +277,3 @@ struct	spigot_softc	*ss = (struct spigot_softc *)&spigot_softc[0];
 
 	return i386_btop(ss->maddr);
 }
-
-#endif /* NSPIGOT */