diff --git a/sys/dev/ntb/if_ntb/if_ntb.c b/sys/dev/ntb/if_ntb/if_ntb.c
index 2724db4f8a0..5b592d7434f 100644
--- a/sys/dev/ntb/if_ntb/if_ntb.c
+++ b/sys/dev/ntb/if_ntb/if_ntb.c
@@ -505,10 +505,8 @@ static device_method_t ntb_net_methods[] = {
 	DEVMETHOD_END
 };
 
-devclass_t ntb_net_devclass;
 static DEFINE_CLASS_0(ntb, ntb_net_driver, ntb_net_methods,
     sizeof(struct ntb_net_ctx));
-DRIVER_MODULE(if_ntb, ntb_transport, ntb_net_driver, ntb_net_devclass,
-    NULL, NULL);
+DRIVER_MODULE(if_ntb, ntb_transport, ntb_net_driver, NULL, NULL);
 MODULE_DEPEND(if_ntb, ntb_transport, 1, 1, 1);
 MODULE_VERSION(if_ntb, 1);
diff --git a/sys/dev/ntb/ntb.c b/sys/dev/ntb/ntb.c
index b765da213e2..d9cc25a4e47 100644
--- a/sys/dev/ntb/ntb.c
+++ b/sys/dev/ntb/ntb.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 
 #include "ntb.h"
 
-devclass_t ntb_hw_devclass;
 SYSCTL_NODE(_hw, OID_AUTO, ntb, CTLFLAG_RW | CTLFLAG_MPSAFE, 0,
     "NTB sysctls");
 
diff --git a/sys/dev/ntb/ntb.h b/sys/dev/ntb/ntb.h
index 8883d52ce1c..e27b06a7c0b 100644
--- a/sys/dev/ntb/ntb.h
+++ b/sys/dev/ntb/ntb.h
@@ -31,7 +31,6 @@
 
 #include "ntb_if.h"
 
-extern devclass_t ntb_hw_devclass;
 SYSCTL_DECL(_hw_ntb);
 
 int ntb_register_device(device_t ntb);
diff --git a/sys/dev/ntb/ntb_hw/ntb_hw_amd.c b/sys/dev/ntb/ntb_hw/ntb_hw_amd.c
index 2d13dc1321c..94cfba2bfe7 100644
--- a/sys/dev/ntb/ntb_hw/ntb_hw_amd.c
+++ b/sys/dev/ntb/ntb_hw/ntb_hw_amd.c
@@ -1310,7 +1310,7 @@ static device_method_t ntb_amd_methods[] = {
 
 static DEFINE_CLASS_0(ntb_hw, ntb_amd_driver, ntb_amd_methods,
     sizeof(struct amd_ntb_softc));
-DRIVER_MODULE(ntb_hw_amd, pci, ntb_amd_driver, ntb_hw_devclass, NULL, NULL);
+DRIVER_MODULE(ntb_hw_amd, pci, ntb_amd_driver, NULL, NULL);
 MODULE_DEPEND(ntb_hw_amd, ntb, 1, 1, 1);
 MODULE_VERSION(ntb_hw_amd, 1);
 PCI_PNP_INFO(amd_ntb_devs);
diff --git a/sys/dev/ntb/ntb_hw/ntb_hw_intel.c b/sys/dev/ntb/ntb_hw/ntb_hw_intel.c
index 00fcc4829b9..774bb14fea0 100644
--- a/sys/dev/ntb/ntb_hw/ntb_hw_intel.c
+++ b/sys/dev/ntb/ntb_hw/ntb_hw_intel.c
@@ -3511,7 +3511,7 @@ static device_method_t ntb_intel_methods[] = {
 
 static DEFINE_CLASS_0(ntb_hw, ntb_intel_driver, ntb_intel_methods,
     sizeof(struct ntb_softc));
-DRIVER_MODULE(ntb_hw_intel, pci, ntb_intel_driver, ntb_hw_devclass, NULL, NULL);
+DRIVER_MODULE(ntb_hw_intel, pci, ntb_intel_driver, NULL, NULL);
 MODULE_DEPEND(ntb_hw_intel, ntb, 1, 1, 1);
 MODULE_VERSION(ntb_hw_intel, 1);
 MODULE_PNP_INFO("W32:vendor/device;D:#", pci, ntb_hw_intel, pci_ids,
diff --git a/sys/dev/ntb/ntb_hw/ntb_hw_plx.c b/sys/dev/ntb/ntb_hw/ntb_hw_plx.c
index 4231b120929..8acf8c82a79 100644
--- a/sys/dev/ntb/ntb_hw/ntb_hw_plx.c
+++ b/sys/dev/ntb/ntb_hw/ntb_hw_plx.c
@@ -1091,6 +1091,6 @@ static device_method_t ntb_plx_methods[] = {
 
 static DEFINE_CLASS_0(ntb_hw, ntb_plx_driver, ntb_plx_methods,
     sizeof(struct ntb_plx_softc));
-DRIVER_MODULE(ntb_hw_plx, pci, ntb_plx_driver, ntb_hw_devclass, NULL, NULL);
+DRIVER_MODULE(ntb_hw_plx, pci, ntb_plx_driver, NULL, NULL);
 MODULE_DEPEND(ntb_hw_plx, ntb, 1, 1, 1);
 MODULE_VERSION(ntb_hw_plx, 1);
diff --git a/sys/dev/ntb/ntb_transport.c b/sys/dev/ntb/ntb_transport.c
index 276fe604086..b67e567a949 100644
--- a/sys/dev/ntb/ntb_transport.c
+++ b/sys/dev/ntb/ntb_transport.c
@@ -1689,10 +1689,8 @@ static device_method_t ntb_transport_methods[] = {
 	DEVMETHOD_END
 };
 
-devclass_t ntb_transport_devclass;
 static DEFINE_CLASS_0(ntb_transport, ntb_transport_driver,
     ntb_transport_methods, sizeof(struct ntb_transport_ctx));
-DRIVER_MODULE(ntb_transport, ntb_hw, ntb_transport_driver,
-    ntb_transport_devclass, NULL, NULL);
+DRIVER_MODULE(ntb_transport, ntb_hw, ntb_transport_driver, NULL, NULL);
 MODULE_DEPEND(ntb_transport, ntb, 1, 1, 1);
 MODULE_VERSION(ntb_transport, 1);
diff --git a/sys/dev/ntb/ntb_transport.h b/sys/dev/ntb/ntb_transport.h
index 7695abdefae..aade22889ac 100644
--- a/sys/dev/ntb/ntb_transport.h
+++ b/sys/dev/ntb/ntb_transport.h
@@ -28,8 +28,6 @@
 
 struct ntb_transport_qp;
 
-extern devclass_t ntb_transport_devclass;
-
 enum ntb_link_event {
 	NTB_LINK_DOWN = 0,
 	NTB_LINK_UP,
diff --git a/sys/dev/ntb/test/ntb_tool.c b/sys/dev/ntb/test/ntb_tool.c
index 76dfd58695e..aae78756501 100644
--- a/sys/dev/ntb/test/ntb_tool.c
+++ b/sys/dev/ntb/test/ntb_tool.c
@@ -1487,9 +1487,8 @@ static device_method_t ntb_tool_methods[] = {
 	DEVMETHOD_END
 };
 
-devclass_t ntb_tool_devclass;
 static DEFINE_CLASS_0(ntb_tool, ntb_tool_driver, ntb_tool_methods,
     sizeof(struct tool_ctx));
-DRIVER_MODULE(ntb_tool, ntb_hw, ntb_tool_driver, ntb_tool_devclass, NULL, NULL);
+DRIVER_MODULE(ntb_tool, ntb_hw, ntb_tool_driver, NULL, NULL);
 MODULE_DEPEND(ntb_tool, ntb, 1, 1, 1);
 MODULE_VERSION(ntb_tool, 1.0);