diff --git a/src/gos/gos_chibios.h b/src/gos/gos_chibios.h
index a3aba712..a4880c16 100644
--- a/src/gos/gos_chibios.h
+++ b/src/gos/gos_chibios.h
@@ -10,6 +10,11 @@
 
 #if GFX_USE_OS_CHIBIOS
 
+// This shouldn't be needed but some people are complaining
+// about TRUE/FALSE redefinition so we fix it here.
+#undef TRUE
+#undef FALSE
+
 #include "ch.h"
 #include "hal.h"
 
@@ -28,6 +33,12 @@
  * are already defined by ChibiOS
  */
 
+#if !defined(FALSE)
+	#define FALSE       0
+#endif
+#if !defined(TRUE)
+	#define TRUE        -1
+#endif
 #if CH_KERNEL_MAJOR == 3
 	typedef char	bool_t;
 #endif