diff --git a/mozilla/modules/plugin/base/public/nptypes.h b/mozilla/modules/plugin/base/public/nptypes.h
index a7ae681cd67..6aacac596b5 100644
--- a/mozilla/modules/plugin/base/public/nptypes.h
+++ b/mozilla/modules/plugin/base/public/nptypes.h
@@ -46,7 +46,9 @@ typedef int int32_t;
 typedef unsigned int uint32_t;
 #else
 #include <stdint.h>
+#ifndef __cplusplus
 #ifndef bool
 typedef int bool;
 #endif
 #endif
+#endif