diff --git a/uuid.h b/uuid.h
index 454c842..088e460 100644
--- a/uuid.h
+++ b/uuid.h
@@ -22,6 +22,10 @@
 
 #include <jack/types.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define JACK_UUID_SIZE 36
 #define JACK_UUID_STRING_SIZE (JACK_UUID_SIZE+1) /* includes trailing null */
 
@@ -33,5 +37,9 @@ extern int  jack_uuid_parse (const char *buf, jack_uuid_t);
 extern void jack_uuid_unparse (const jack_uuid_t, char buf[JACK_UUID_STRING_SIZE]);
 extern int  jack_uuid_empty (const jack_uuid_t);
 
+#ifdef __cplusplus
+} /* namespace */
+#endif
+
 #endif /* __jack_uuid_h__ */