diff --git a/sys/dev/gpio/acpi_gpiobus.c b/sys/dev/gpio/acpi_gpiobus.c
--- a/sys/dev/gpio/acpi_gpiobus.c
+++ b/sys/dev/gpio/acpi_gpiobus.c
@@ -401,7 +401,7 @@
 	struct acpi_gpiobus_ivar *devi = device_get_ivars(child);
 
 	switch (which) {
-	case ACPI_GPIOBUS_IVAR_HANDLE:
+	case ACPI_IVAR_HANDLE:
 		*result = (uintptr_t)devi->handle;
 		break;
 	default:
diff --git a/sys/dev/gpio/acpi_gpiobusvar.h b/sys/dev/gpio/acpi_gpiobusvar.h
--- a/sys/dev/gpio/acpi_gpiobusvar.h
+++ b/sys/dev/gpio/acpi_gpiobusvar.h
@@ -28,21 +28,8 @@
 #ifndef	__ACPI_GPIOBUS_H__
 #define	__ACPI_GPIOBUS_H__
 
-#include <sys/bus.h>
-
 #include <contrib/dev/acpica/include/acpi.h>
 
-enum acpi_gpiobus_ivars {
-	ACPI_GPIOBUS_IVAR_HANDLE	= 10600
-};
-
-#define ACPI_GPIOBUS_ACCESSOR(var, ivar, type)			\
-	__BUS_ACCESSOR(acpi_gpiobus, var, ACPI_GPIOBUS, ivar, type)
-
-ACPI_GPIOBUS_ACCESSOR(handle,	HANDLE,		ACPI_HANDLE)
-
-#undef ACPI_GPIOBUS_ACCESSOR
-
 uint32_t acpi_gpiobus_convflags(ACPI_RESOURCE_GPIO *);
 
 #endif	/* __ACPI_GPIOBUS_H__ */
diff --git a/sys/dev/gpio/gpioaei.c b/sys/dev/gpio/gpioaei.c
--- a/sys/dev/gpio/gpioaei.c
+++ b/sys/dev/gpio/gpioaei.c
@@ -208,7 +208,7 @@
 	/* This is us. */
 	device_set_desc(dev, "ACPI Event Information Device");
 
-	handle = acpi_gpiobus_get_handle(dev);
+	handle = acpi_get_handle(dev);
 	status = AcpiGetParent(handle, &sc->dev_handle);
 	if (ACPI_FAILURE(status)) {
 		device_printf(dev, "Cannot get parent of %s\n",