8 files changed, 41 insertions, 10 deletions
diff --git a/lv2/lv2plug.in/ns/ext/atom/atom.h b/lv2/lv2plug.in/ns/ext/atom/atom.h
index 9707a94..3f0195b 100644
--- a/lv2/lv2plug.in/ns/ext/atom/atom.h
+++ b/lv2/lv2plug.in/ns/ext/atom/atom.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 2008-2012 David Robillard <http://drobilla.net>
+  Copyright 2008-2014 David Robillard <http://drobilla.net>
 
   Permission to use, copy, modify, and/or distribute this software for any
   purpose with or without fee is hereby granted, provided that the above
diff --git a/lv2/lv2plug.in/ns/ext/atom/util.h b/lv2/lv2plug.in/ns/ext/atom/util.h
index d7c020b..9dc5d32 100644
--- a/lv2/lv2plug.in/ns/ext/atom/util.h
+++ b/lv2/lv2plug.in/ns/ext/atom/util.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 2008-2013 David Robillard <http://drobilla.net>
+  Copyright 2008-2014 David Robillard <http://drobilla.net>
 
   Permission to use, copy, modify, and/or distribute this software for any
   purpose with or without fee is hereby granted, provided that the above
diff --git a/lv2/lv2plug.in/ns/ext/data-access/data-access.h b/lv2/lv2plug.in/ns/ext/data-access/data-access.h
index b19f65f..68aaf62 100644
--- a/lv2/lv2plug.in/ns/ext/data-access/data-access.h
+++ b/lv2/lv2plug.in/ns/ext/data-access/data-access.h
@@ -29,6 +29,10 @@
 
 #define LV2_DATA_ACCESS_URI "http://lv2plug.in/ns/ext/data-access"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
    The data field of the LV2_Feature for this extension.
 
@@ -52,4 +56,8 @@ typedef struct {
 	const void* (*data_access)(const char* uri);
 } LV2_Extension_Data_Feature;
 
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
 #endif  /* LV2_DATA_ACCESS_H */
diff --git a/lv2/lv2plug.in/ns/ext/event/event.h b/lv2/lv2plug.in/ns/ext/event/event.h
index aeb1332..e33d862 100644
--- a/lv2/lv2plug.in/ns/ext/event/event.h
+++ b/lv2/lv2plug.in/ns/ext/event/event.h
@@ -51,6 +51,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
    The best Pulses Per Quarter Note for tempo-based uint32_t timestamps.
    Equal to 2^12 * 5 * 7 * 9 * 11 * 13 * 17, which is evenly divisble
@@ -283,5 +287,8 @@ typedef struct {
 	                            LV2_Event*              event);
 } LV2_Event_Feature;
 
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
 
 #endif /* LV2_EVENT_H */
diff --git a/lv2/lv2plug.in/ns/ext/time/time.h b/lv2/lv2plug.in/ns/ext/time/time.h
index 3bb0614..4f2bea0 100644
--- a/lv2/lv2plug.in/ns/ext/time/time.h
+++ b/lv2/lv2plug.in/ns/ext/time/time.h
@@ -22,10 +22,6 @@
 #ifndef LV2_TIME_H
 #define LV2_TIME_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define LV2_TIME_URI "http://lv2plug.in/ns/ext/time"
 
 #define LV2_TIME__Time            LV2_TIME_URI "#Time"
@@ -42,8 +38,4 @@ extern "C" {
 #define LV2_TIME__framesPerSecond LV2_TIME_URI "#framesPerSecond"
 #define LV2_TIME__speed           LV2_TIME_URI "#speed"
 
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
 #endif  /* LV2_TIME_H */
diff --git a/lv2/lv2plug.in/ns/ext/uri-map/uri-map.h b/lv2/lv2plug.in/ns/ext/uri-map/uri-map.h
index d1dc2f7..2062af3 100644
--- a/lv2/lv2plug.in/ns/ext/uri-map/uri-map.h
+++ b/lv2/lv2plug.in/ns/ext/uri-map/uri-map.h
@@ -34,6 +34,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
    Opaque pointer to host data.
 */
@@ -87,4 +91,8 @@ typedef struct {
 	                      const char*               uri);
 } LV2_URI_Map_Feature;
 
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
 #endif /* LV2_URI_MAP_H */
diff --git a/lv2/lv2plug.in/ns/ext/urid/urid.h b/lv2/lv2plug.in/ns/ext/urid/urid.h
index b4be712..c317f7f 100644
--- a/lv2/lv2plug.in/ns/ext/urid/urid.h
+++ b/lv2/lv2plug.in/ns/ext/urid/urid.h
@@ -35,6 +35,10 @@
 
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
    Opaque pointer to host data for LV2_URID_Map.
 */
@@ -118,4 +122,8 @@ typedef struct _LV2_URID_Unmap {
 	                     LV2_URID              urid);
 } LV2_URID_Unmap;
 
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
 #endif /* LV2_URID_H */
diff --git a/lv2/lv2plug.in/ns/ext/worker/worker.h b/lv2/lv2plug.in/ns/ext/worker/worker.h
index 74ac45b..00b1039 100644
--- a/lv2/lv2plug.in/ns/ext/worker/worker.h
+++ b/lv2/lv2plug.in/ns/ext/worker/worker.h
@@ -32,6 +32,10 @@
 #define LV2_WORKER__interface LV2_WORKER_PREFIX "interface"
 #define LV2_WORKER__schedule  LV2_WORKER_PREFIX "schedule"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
    A status code for worker functions.
 */
@@ -147,4 +151,8 @@ typedef struct _LV2_Worker_Schedule {
 	                                   const void*                data);
 } LV2_Worker_Schedule;
 
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
 #endif  /* LV2_WORKER_H */