diff --git a/include/math.h b/include/math.h
index 6ac91da..7c7e4aa 100644
--- a/include/math.h
+++ b/include/math.h
@@ -427,4 +427,8 @@ long double pow10l(long double);
 }
 #endif
 
+#ifdef __cplusplus
+#include_next <math.h>
+#endif
+
 #endif
diff --git a/include/pthread.h b/include/pthread.h
index af70b73..2995846 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -55,7 +55,7 @@ extern "C" {
 #define PTHREAD_PROCESS_SHARED 1
 
 
-#define PTHREAD_MUTEX_INITIALIZER {{{0}}}
+#define PTHREAD_MUTEX_INITIALIZER {{{0, 0, 0, 0, 0, 0 }}}
 #define PTHREAD_RWLOCK_INITIALIZER {{{0}}}
 #define PTHREAD_COND_INITIALIZER {{{0}}}
 #define PTHREAD_ONCE_INIT 0
diff --git a/tools/mkalltypes.sed b/tools/mkalltypes.sed
index fa15efc..f03f6a4 100644
--- a/tools/mkalltypes.sed
+++ b/tools/mkalltypes.sed
@@ -1,6 +1,7 @@
-/^TYPEDEF/s/TYPEDEF \(.*\) \([^ ]*\);$/#if defined(__NEED_\2) \&\& !defined(__DEFINED_\2)\
+/^TYPEDEF/s/TYPEDEF \(.*\) \([^ ]*\);$/#if defined(__NEED_\2) \&\& !defined(__DEFINED_\2) \&\& !defined(__CLANG_\U\2\E_DEFINED)\
 typedef \1 \2;\
 #define __DEFINED_\2\
+#define __CLANG_\U\2\E_DEFINED\
 #endif\
 /
 /^STRUCT/s/STRUCT * \([^ ]*\) \(.*\);$/#if defined(__NEED_struct_\1) \&\& !defined(__DEFINED_struct_\1)\