2 files changed, 8 insertions, 8 deletions

diff --git a/sys/dev/puc/puc_ebus.c b/sys/dev/puc/puc_ebus.c
index ce0184a73e4c0..c7ddeb40153e5 100644
--- a/sys/dev/puc/puc_ebus.c
+++ b/sys/dev/puc/puc_ebus.c
@@ -35,13 +35,13 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
+
+#include <dev/ofw/ofw_bus.h>
+
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <machine/resource.h>
 
-#include <dev/ofw/openfirm.h>
-#include <sparc64/ebus/ebusvar.h>
-
 #define	PUC_ENTRAILS	1
 #include <dev/puc/pucvar.h>
 
@@ -50,7 +50,7 @@ puc_ebus_probe(device_t dev)
 {
 	const char *nm;
 
-	nm = ebus_get_name(dev);
+	nm = ofw_bus_get_name(dev);
 	if (!strcmp(nm, "se")) {
 		device_set_desc(dev, "Siemens SAB 82532 dual channel SCC");
 		return (0);
diff --git a/sys/dev/puc/puc_sbus.c b/sys/dev/puc/puc_sbus.c
index efc55c4250375..47a2fb41303a9 100644
--- a/sys/dev/puc/puc_sbus.c
+++ b/sys/dev/puc/puc_sbus.c
@@ -35,13 +35,13 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
+
+#include <dev/ofw/ofw_bus.h>
+
 #include <machine/bus.h>
 #include <sys/rman.h>
 #include <machine/resource.h>
 
-#include <dev/ofw/openfirm.h>
-#include <sparc64/sbus/sbusvar.h>
-
 #define	PUC_ENTRAILS	1
 #include <dev/puc/pucvar.h>
 
@@ -50,7 +50,7 @@ puc_sbus_probe(device_t dev)
 {
 	const char *nm;
 
-	nm = sbus_get_name(dev);
+	nm = ofw_bus_get_name(dev);
 	if (!strcmp(nm, "zs")) {
 		device_set_desc(dev, "Zilog Z8530 dual channel SCC");
 		return (0);