The <mutex> header uses some small amount of private model-checker
information, so just move the common typedefs to our external include/
directory.
--- /dev/null
+#ifndef __MODELTYPES_H__
+#define __MODELTYPES_H__
+
+typedef int thread_id_t;
+
+#define THREAD_ID_T_NONE -1
+
+typedef unsigned int modelclock_t;
+
+#endif /* __MODELTYPES_H__ */
+++ /dev/null
-#ifndef __MODELTYPES_H__
-#define __MODELTYPES_H__
-
-typedef int thread_id_t;
-
-#define THREAD_ID_T_NONE -1
-
-typedef unsigned int modelclock_t;
-
-#endif /* __MODELTYPES_H__ */