diff --git a/bindings/go/blst_headers/blst.h b/bindings/go/blst_headers/blst.h
index 1349896a3..8e0a488cd 100644
--- a/bindings/go/blst_headers/blst.h
+++ b/bindings/go/blst_headers/blst.h
@@ -25,10 +25,13 @@ typedef __UINT64_TYPE__ uint64_t;
 extern "C" {
 #elif defined(__BLST_CGO__)
 typedef _Bool bool; /* it's assumed that cgo calls modern enough compiler */
-#elif defined(__STDC_VERSION__) && __STDC_VERSION__>=199901
-# define bool _Bool
-#else
-# define bool int
+#elif !defined(bool)
+# if defined(__STDC_VERSION__) && __STDC_VERSION__>=199901
+#  define bool _Bool
+# else
+#  define bool int
+# endif
+# define __blst_h_bool__
 #endif
 
 #ifdef SWIG
@@ -478,5 +481,8 @@ extern const blst_p2_affine BLS12_381_NEG_G2;
 
 #ifdef __cplusplus
 }
+#elif defined(__blst_h_bool__)
+# undef __blst_h_bool__
+# undef bool
 #endif
 #endif
diff --git a/blst b/blst
index 3dd0f804b..e99f7db0d 160000
--- a/blst
+++ b/blst
@@ -1 +1 @@
-Subproject commit 3dd0f804b1819e5d03fb22ca2e6fac105932043a
+Subproject commit e99f7db0db413e2efefcfd077a4e335766f39c27