diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c
--- a/sys/dev/acpica/acpi_pci_link.c
+++ b/sys/dev/acpica/acpi_pci_link.c
@@ -104,8 +104,8 @@
 	int	l_num_irqs;
 	int	*l_irqs;
 	int	l_references;
-	int	l_routed:1;
-	int	l_isa_irq:1;
+	bool	l_routed:1;
+	bool	l_isa_irq:1;
 	ACPI_RESOURCE l_prs_template;
 };
 
@@ -355,18 +355,18 @@
 		 * valid IRQs are ISA IRQs, then mark this link as
 		 * routed via an ISA interrupt.
 		 */
-		link->l_isa_irq = TRUE;
+		link->l_isa_irq = true;
 		link->l_irqs = malloc(sizeof(int) * link->l_num_irqs,
 		    M_PCI_LINK, M_WAITOK | M_ZERO);
 		for (i = 0; i < link->l_num_irqs; i++) {
 			if (is_ext_irq) {
 				link->l_irqs[i] = ext_irqs[i];
 				if (ext_irqs[i] >= NUM_ISA_INTERRUPTS)
-					link->l_isa_irq = FALSE;
+					link->l_isa_irq = false;
 			} else {
 				link->l_irqs[i] = irqs[i];
 				if (irqs[i] >= NUM_ISA_INTERRUPTS)
-					link->l_isa_irq = FALSE;
+					link->l_isa_irq = false;
 			}
 		}
 
@@ -376,7 +376,7 @@
 		 */
 		if (!req->sc->pl_crs_bad && !link->l_isa_irq &&
 		    link->l_crs_type == ACPI_RESOURCE_TYPE_IRQ)
-			req->sc->pl_crs_bad = TRUE;
+			req->sc->pl_crs_bad = true;
 		break;
 	default:
 		if (req->in_dpf == DPF_IGNORE)
@@ -390,7 +390,7 @@
 	return (AE_OK);
 }
 
-static int
+static bool
 link_valid_irq(struct link *link, int irq)
 {
 	int i;
@@ -399,12 +399,12 @@
 
 	/* Invalid interrupts are never valid. */
 	if (!PCI_INTERRUPT_VALID(irq))
-		return (FALSE);
+		return (false);
 
 	/* Any interrupt in the list of possible interrupts is valid. */
 	for (i = 0; i < link->l_num_irqs; i++)
 		if (link->l_irqs[i] == irq)
-			 return (TRUE);
+			 return (true);
 
 	/*
 	 * For links routed via an ISA interrupt, if the SCI is routed via
@@ -412,10 +412,10 @@
 	 */
 	if (link->l_isa_irq && AcpiGbl_FADT.SciInterrupt == irq &&
 	    irq < NUM_ISA_INTERRUPTS)
-		return (TRUE);
+		return (true);
 
 	/* If the interrupt wasn't found in the list it is not valid. */
-	return (FALSE);
+	return (false);
 }
 
 static void
@@ -493,7 +493,7 @@
 		sc->pl_links[i].l_irq = PCI_INVALID_IRQ;
 		sc->pl_links[i].l_bios_irq = PCI_INVALID_IRQ;
 		sc->pl_links[i].l_sc = sc;
-		sc->pl_links[i].l_isa_irq = FALSE;
+		sc->pl_links[i].l_isa_irq = false;
 		sc->pl_links[i].l_res_index = -1;
 	}
 
@@ -558,7 +558,7 @@
 	else
 		for (i = 0; i < sc->pl_num_links; i++)
 			if (PCI_INTERRUPT_VALID(sc->pl_links[i].l_irq))
-				sc->pl_links[i].l_routed = TRUE;
+				sc->pl_links[i].l_routed = true;
 	if (bootverbose)
 		acpi_pci_link_dump(sc, 0, "After Disable");
 	ACPI_SERIAL_END(pci_link);
@@ -904,7 +904,7 @@
 			 */
 			if (!link->l_routed &&
 			    PCI_INTERRUPT_VALID(link->l_irq)) {
-				link->l_routed = TRUE;
+				link->l_routed = true;
 				acpi_config_intr(dev, resource);
 				pci_link_interrupt_weights[link->l_irq] +=
 				    link->l_references;
diff --git a/sys/dev/acpica/acpi_pxm.c b/sys/dev/acpica/acpi_pxm.c
--- a/sys/dev/acpica/acpi_pxm.c
+++ b/sys/dev/acpica/acpi_pxm.c
@@ -56,8 +56,8 @@
 
 #if MAXMEMDOM > 1
 static struct cpu_info {
-	int enabled:1;
-	int has_memory:1;
+	bool enabled:1;
+	bool has_memory:1;
 	int domain;
 	int id;
 } *cpus;
diff --git a/sys/dev/otus/if_otusreg.h b/sys/dev/otus/if_otusreg.h
--- a/sys/dev/otus/if_otusreg.h
+++ b/sys/dev/otus/if_otusreg.h
@@ -1020,7 +1020,7 @@
 	uint8_t				capflags;
 	uint8_t				rxmask;
 	uint8_t				txmask;
-	int				sc_running:1,
+	bool				sc_running:1,
 					sc_calibrating:1,
 					sc_scanning:1;
 
diff --git a/sys/dev/puc/puc.c b/sys/dev/puc/puc.c
--- a/sys/dev/puc/puc.c
+++ b/sys/dev/puc/puc.c
@@ -61,7 +61,7 @@
 	int		p_type;
 	int		p_rclk;
 
-	int		p_hasintr:1;
+	bool		p_hasintr:1;
 
 	serdev_intr_t	*p_ihsrc[PUC_ISRCCNT];
 	void		*p_iharg;
diff --git a/sys/dev/puc/puc_bfe.h b/sys/dev/puc/puc_bfe.h
--- a/sys/dev/puc/puc_bfe.h
+++ b/sys/dev/puc/puc_bfe.h
@@ -64,10 +64,10 @@
 	int		sc_nports;
 	struct puc_port *sc_port;
 
-	int		sc_fastintr:1;
-	int		sc_leaving:1;
-	int		sc_polled:1;
-	int		sc_msi:1;
+	bool		sc_fastintr:1;
+	bool		sc_leaving:1;
+	bool		sc_polled:1;
+	bool		sc_msi:1;
 
 	int		sc_ilr;
 
diff --git a/sys/dev/quicc/quicc_bfe.h b/sys/dev/quicc/quicc_bfe.h
--- a/sys/dev/quicc/quicc_bfe.h
+++ b/sys/dev/quicc/quicc_bfe.h
@@ -51,8 +51,8 @@
 
 	u_int		sc_clock;
 
-	int		sc_fastintr:1;
-	int		sc_polled:1;
+	bool		sc_fastintr:1;
+	bool		sc_polled:1;
 };
 
 extern char quicc_driver_name[];
diff --git a/sys/dev/scc/scc_bfe.h b/sys/dev/scc/scc_bfe.h
--- a/sys/dev/scc/scc_bfe.h
+++ b/sys/dev/scc/scc_bfe.h
@@ -72,11 +72,11 @@
 	device_t	m_dev;
 
 	u_int		m_mode;
-	int		m_attached:1;
-	int		m_fastintr:1;
-	int		m_hasintr:1;
-	int		m_probed:1;
-	int		m_sysdev:1;
+	bool		m_attached:1;
+	bool		m_fastintr:1;
+	bool		m_hasintr:1;
+	bool		m_probed:1;
+	bool		m_sysdev:1;
 
 	driver_filter_t	*ih;
 	serdev_intr_t	*ih_src[SCC_ISRCCNT];
@@ -94,8 +94,8 @@
 	struct scc_mode	ch_mode[SCC_NMODES];
 
 	u_int		ch_nr;
-	int		ch_enabled:1;
-	int		ch_sysdev:1;
+	bool		ch_enabled:1;
+	bool		ch_sysdev:1;
 
 	uint32_t	ch_ipend;
 	uint32_t	ch_hwsig;
@@ -130,9 +130,9 @@
 
 	struct scc_chan	*sc_chan;
 
-	int		sc_fastintr:1;
-	int		sc_leaving:1;
-	int		sc_polled:1;
+	bool		sc_fastintr:1;
+	bool		sc_leaving:1;
+	bool		sc_polled:1;
 
 	uint32_t        sc_hwsig;       /* Signal state. Used by HW driver. */
 };
diff --git a/sys/dev/uart/uart_bus.h b/sys/dev/uart/uart_bus.h
--- a/sys/dev/uart/uart_bus.h
+++ b/sys/dev/uart/uart_bus.h
@@ -89,16 +89,16 @@
 	int		sc_irid;
 	struct callout	sc_timer;
 
-	int		sc_callout:1;	/* This UART is opened for callout. */
-	int		sc_fastintr:1;	/* This UART uses fast interrupts. */
-	int		sc_hwiflow:1;	/* This UART has HW input flow ctl. */
-	int		sc_hwoflow:1;	/* This UART has HW output flow ctl. */
-	int		sc_leaving:1;	/* This UART is going away. */
-	int		sc_opened:1;	/* This UART is open for business. */
-	int		sc_polled:1;	/* This UART has no interrupts. */
-	int		sc_txbusy:1;	/* This UART is transmitting. */
-	int		sc_isquelch:1;	/* This UART has input squelched. */
-	int		sc_testintr:1;	/* This UART is under int. testing. */
+	bool		sc_callout:1;	/* This UART is opened for callout. */
+	bool		sc_fastintr:1;	/* This UART uses fast interrupts. */
+	bool		sc_hwiflow:1;	/* This UART has HW input flow ctl. */
+	bool		sc_hwoflow:1;	/* This UART has HW output flow ctl. */
+	bool		sc_leaving:1;	/* This UART is going away. */
+	bool		sc_opened:1;	/* This UART is open for business. */
+	bool		sc_polled:1;	/* This UART has no interrupts. */
+	bool		sc_txbusy:1;	/* This UART is transmitting. */
+	bool		sc_isquelch:1;	/* This UART has input squelched. */
+	bool		sc_testintr:1;	/* This UART is under int. testing. */
 
 	struct uart_devinfo *sc_sysdev;	/* System device (or NULL). */
 
diff --git a/sys/dev/wpi/if_wpivar.h b/sys/dev/wpi/if_wpivar.h
--- a/sys/dev/wpi/if_wpivar.h
+++ b/sys/dev/wpi/if_wpivar.h
@@ -77,7 +77,7 @@
 	uint8_t			cur;
 	uint8_t			pending;
 	int16_t			queued;
-	int			update:1;
+	bool			update:1;
 };
 
 struct wpi_rx_data {
diff --git a/sys/x86/include/x86_smp.h b/sys/x86/include/x86_smp.h
--- a/sys/x86/include/x86_smp.h
+++ b/sys/x86/include/x86_smp.h
@@ -56,10 +56,10 @@
 extern int nmi_is_broadcast;
 
 struct cpu_info {
-	int	cpu_present:1;
-	int	cpu_bsp:1;
-	int	cpu_disabled:1;
-	int	cpu_hyperthread:1;
+	bool	cpu_present:1;
+	bool	cpu_bsp:1;
+	bool	cpu_disabled:1;
+	bool	cpu_hyperthread:1;
 };
 extern struct cpu_info *cpu_info;