diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
index 60d32c0335e32..049800a32d414 100644
--- a/Zend/zend_globals.h
+++ b/Zend/zend_globals.h
@@ -81,7 +81,8 @@ struct _zend_compiler_globals {
 
 	HashTable *auto_globals;
 
-	zend_bool parse_error;
+	/* Refer to zend_yytnamerr() in zend_language_parser.y for meaning of values */
+	zend_uchar parse_error;
 	zend_bool in_compilation;
 	zend_bool short_tags;
 
diff --git a/Zend/zend_types.h b/Zend/zend_types.h
index 026177cf17ffa..52997488736f8 100644
--- a/Zend/zend_types.h
+++ b/Zend/zend_types.h
@@ -24,6 +24,7 @@
 
 #include "zend_portability.h"
 #include "zend_long.h"
+#include <stdbool.h>
 
 #ifdef __SSE2__
 # include <mmintrin.h>
@@ -46,7 +47,7 @@
 # define ZEND_ENDIAN_LOHI_C_4(a, b, c, d)  a, b, c, d
 #endif
 
-typedef unsigned char zend_bool;
+typedef bool zend_bool;
 typedef unsigned char zend_uchar;
 
 typedef enum {
diff --git a/main/main.c b/main/main.c
index 119fbb26dfda3..ae6b539ba2588 100644
--- a/main/main.c
+++ b/main/main.c
@@ -447,9 +447,9 @@ static PHP_INI_MH(OnUpdateTimeout)
 
 /* {{{ php_get_display_errors_mode() helper function
  */
-static int php_get_display_errors_mode(char *value, size_t value_length)
+static zend_uchar php_get_display_errors_mode(char *value, size_t value_length)
 {
-	int mode;
+	zend_uchar mode;
 
 	if (!value) {
 		return PHP_DISPLAY_ERRORS_STDOUT;
@@ -480,7 +480,7 @@ static int php_get_display_errors_mode(char *value, size_t value_length)
  */
 static PHP_INI_MH(OnUpdateDisplayErrors)
 {
-	PG(display_errors) = (zend_bool) php_get_display_errors_mode(ZSTR_VAL(new_value), ZSTR_LEN(new_value));
+	PG(display_errors) = php_get_display_errors_mode(ZSTR_VAL(new_value), ZSTR_LEN(new_value));
 
 	return SUCCESS;
 }
@@ -490,7 +490,8 @@ static PHP_INI_MH(OnUpdateDisplayErrors)
  */
 static PHP_INI_DISP(display_errors_mode)
 {
-	int mode, cgi_or_cli;
+	zend_uchar mode;
+	bool cgi_or_cli;
 	size_t tmp_value_length;
 	char *tmp_value;
 
diff --git a/main/php_globals.h b/main/php_globals.h
index 3f34aac951d6c..42337e5b9bd10 100644
--- a/main/php_globals.h
+++ b/main/php_globals.h
@@ -65,7 +65,7 @@ struct _php_core_globals {
 	zend_long memory_limit;
 	zend_long max_input_time;
 
-	zend_bool display_errors;
+	zend_uchar display_errors;
 	zend_bool display_startup_errors;
 	zend_bool log_errors;
 	zend_long      log_errors_max_len;