diff --git a/sys/dev/acpica/acpi_button.c b/sys/dev/acpica/acpi_button.c
--- a/sys/dev/acpica/acpi_button.c
+++ b/sys/dev/acpica/acpi_button.c
@@ -53,10 +53,8 @@
 struct acpi_button_softc {
     device_t	button_dev;
     ACPI_HANDLE	button_handle;
-    boolean_t	button_type;
-#define		ACPI_POWER_BUTTON	0
-#define		ACPI_SLEEP_BUTTON	1
-    boolean_t	fixed;
+    enum { ACPI_POWER_BUTTON, ACPI_SLEEP_BUTTON } button_type;
+    bool	fixed;
 #ifdef EVDEV_SUPPORT
     struct evdev_dev *button_evdev;
 #endif
@@ -120,14 +118,14 @@
     } else if (strcmp(str, "ACPI_FPB") == 0) {
 	device_set_desc(dev, "Power Button (fixed)");
 	sc->button_type = ACPI_POWER_BUTTON;
-	sc->fixed = 1;
+	sc->fixed = true;
     } else if (strcmp(str, "PNP0C0E") == 0) {
 	device_set_desc(dev, "Sleep Button");
 	sc->button_type = ACPI_SLEEP_BUTTON;
     } else if (strcmp(str, "ACPI_FSB") == 0) {
 	device_set_desc(dev, "Sleep Button (fixed)");
 	sc->button_type = ACPI_SLEEP_BUTTON;
-	sc->fixed = 1;
+	sc->fixed = true;
     }
 
     return (rv);