diff --git a/glfw/glfw3.h b/glfw/glfw3.h
index fd4a9144f..5a9a552e5 100644
--- a/glfw/glfw3.h
+++ b/glfw/glfw3.h
@@ -133,6 +133,8 @@ extern "C" {
  */
 #include <stdint.h>
 
+#include <stdbool.h>
+
 /* Include the chosen OpenGL or OpenGL ES headers.
  */
 #if defined(GLFW_INCLUDE_ES1)
@@ -277,14 +279,14 @@ extern "C" {
  *  semantic sugar for the number 1.  You can also use `1` or `true` or `_True`
  *  or `GL_TRUE` or whatever you want.
  */
-#define GLFW_TRUE                   1
+#define GLFW_TRUE                   true
 /*! @brief Zero.
  *
  *  Zero.  Seriously.  You don't _need_ to use this symbol in your code.  It's
  *  semantic sugar for the number 0.  You can also use `0` or `false` or
  *  `_False` or `GL_FALSE` or whatever you want.
  */
-#define GLFW_FALSE                  0
+#define GLFW_FALSE                  false
 /*! @} */
 
 /*! @name Key and button actions
diff --git a/glfw/internal.h b/glfw/internal.h
index f5fe8d021..52d8d42f1 100644
--- a/glfw/internal.h
+++ b/glfw/internal.h
@@ -60,7 +60,7 @@
 
 #define _GLFW_MESSAGE_SIZE      1024
 
-typedef int GLFWbool;
+typedef bool GLFWbool;
 typedef unsigned long long GLFWid;
 
 typedef struct _GLFWerror       _GLFWerror;