6 files changed, 12 insertions, 14 deletions
diff --git a/src/kernel/ao.h b/src/kernel/ao.h
index 3beeb880..cdcdadc3 100644
--- a/src/kernel/ao.h
+++ b/src/kernel/ao.h
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stddef.h>
+#include <stdbool.h>
 #include <ao_pins.h>
 #include <ao_arch.h>
 
@@ -35,9 +36,6 @@
 extern int ao_putchar(char c);
 extern char ao_getchar(void);
 
-#define TRUE 1
-#define FALSE 0
-
 #ifndef HAS_TASK
 #define HAS_TASK	1
 #endif
diff --git a/src/kernel/ao_fake_flight.c b/src/kernel/ao_fake_flight.c
index 8da0141c..ec8691e9 100644
--- a/src/kernel/ao_fake_flight.c
+++ b/src/kernel/ao_fake_flight.c
@@ -54,7 +54,7 @@ ao_fake_data_read(void)
 	uint8_t	*d = (void *) &ao_fake_next;
 
 	if (getchar() == 0)
-		return FALSE;
+		return false;
 	for (i = 0; i < sizeof (struct ao_data); i++)
 		*d++ = getchar();
 	if (!ao_fake_has_offset) {
@@ -64,7 +64,7 @@ ao_fake_data_read(void)
 	} else
 		ao_fake_next.tick += ao_fake_tick_offset;
 	ao_fake_has_next = 1;
-	return TRUE;
+	return true;
 }
 
 static void
@@ -118,10 +118,10 @@ ao_fake_calib_read(void)
 		) {
 		printf ("Calibration data major version mismatch %d.%d <= %d.%d\n",
 			ao_calib.major, ao_calib.minor, AO_FAKE_CALIB_MAJOR, AO_FAKE_CALIB_MINOR);
-		return FALSE;
+		return false;
 	}
 	ao_fake_calib_set(&ao_calib);
-	return TRUE;
+	return true;
 }
 
 static void
diff --git a/src/kernel/ao_power.c b/src/kernel/ao_power.c
index bf59ab53..8c490604 100644
--- a/src/kernel/ao_power.c
+++ b/src/kernel/ao_power.c
@@ -26,7 +26,7 @@ ao_power_register(struct ao_power *power)
 {
 	if (power->registered)
 		return;
-	power->registered = TRUE;
+	power->registered = true;
 	if (tail) {
 		tail->next = power;
 		power->prev = tail;
@@ -44,7 +44,7 @@ ao_power_unregister(struct ao_power *power)
 {
 	if (!power->registered)
 		return;
-	power->registered = FALSE;
+	power->registered = false;
 	if (power->prev)
 		power->prev->next = power->next;
 	else
diff --git a/src/kernel/ao_pyro.c b/src/kernel/ao_pyro.c
index 173cf8a3..c01c9512 100644
--- a/src/kernel/ao_pyro.c
+++ b/src/kernel/ao_pyro.c
@@ -205,9 +205,9 @@ ao_pyro_ready(struct ao_pyro *pyro)
 		default:
 			continue;
 		}
-		return FALSE;
+		return false;
 	}
-	return TRUE;
+	return true;
 }
 
 #ifndef AO_FLIGHT_TEST
diff --git a/src/kernel/ao_sample.c b/src/kernel/ao_sample.c
index 115eae80..9cba36c1 100644
--- a/src/kernel/ao_sample.c
+++ b/src/kernel/ao_sample.c
@@ -277,7 +277,7 @@ ao_sample_preflight(void)
 		ao_accel_scale = to_fix_32(GRAVITY * 2 * 16) / ao_accel_2g;
 #endif
 		ao_sample_preflight_set();
-		ao_preflight = FALSE;
+		ao_preflight = false;
 	}
 }
 
@@ -398,5 +398,5 @@ ao_sample_init(void)
 	ao_sample_set_all_orients();
 #endif
 	ao_sample_data = ao_data_head;
-	ao_preflight = TRUE;
+	ao_preflight = true;
 }
diff --git a/src/kernel/ao_sample.h b/src/kernel/ao_sample.h
index af6eca4e..4c51a58c 100644
--- a/src/kernel/ao_sample.h
+++ b/src/kernel/ao_sample.h
@@ -154,7 +154,7 @@ extern uint8_t	ao_sample_orient_pos;
 
 void ao_sample_init(void);
 
-/* returns FALSE in preflight mode, TRUE in flight mode */
+/* returns false in preflight mode, true in flight mode */
 uint8_t ao_sample(void);
 
 /*