diff --git a/wayland-client.h b/wayland-client.h
index faeb7689..dbe89703 100644
--- a/wayland-client.h
+++ b/wayland-client.h
@@ -23,6 +23,10 @@
 #ifndef _WAYLAND_CLIENT_H
 #define _WAYLAND_CLIENT_H
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 struct wl_object;
 struct wl_display;
 struct wl_surface;
@@ -148,4 +152,9 @@ void wl_display_write(struct wl_display *display,
 		      size_t count);
 void wl_display_advertise_global(struct wl_display *display,
 				 struct wl_object *object);
+
+#ifdef  __cplusplus
+}
+#endif
+
 #endif
diff --git a/wayland-protocol.h b/wayland-protocol.h
index fa29fe72..eca2108f 100644
--- a/wayland-protocol.h
+++ b/wayland-protocol.h
@@ -23,6 +23,10 @@
 #ifndef WAYLAND_PROTOCOL_H
 #define WAYLAND_PROTOCOL_H
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 #include <stdint.h>
 
 #define WL_DISPLAY_INVALID_OBJECT	0
@@ -68,4 +72,8 @@ extern const struct wl_interface wl_output_interface;
 
 extern const struct wl_interface wl_visual_interface;
 
+#ifdef  __cplusplus
+}
+#endif
+
 #endif
diff --git a/wayland-util.h b/wayland-util.h
index ed4acbc0..bc9d89b6 100644
--- a/wayland-util.h
+++ b/wayland-util.h
@@ -23,6 +23,10 @@
 #ifndef WAYLAND_UTIL_H
 #define WAYLAND_UTIL_H
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 #include <inttypes.h>
 
 /* GCC visibility */
@@ -104,4 +108,8 @@ void wl_array_init(struct wl_array *array);
 void wl_array_release(struct wl_array *array);
 void *wl_array_add(struct wl_array *array, int size);
 
+#ifdef  __cplusplus
+}
+#endif
+
 #endif
diff --git a/wayland.h b/wayland.h
index bffd415e..d4bdbc83 100644
--- a/wayland.h
+++ b/wayland.h
@@ -23,6 +23,10 @@
 #ifndef WAYLAND_H
 #define WAYLAND_H
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 #include <stdint.h>
 #include "wayland-util.h"
 
@@ -151,4 +155,8 @@ wl_display_post_frame(struct wl_display *display,
 		      struct wl_compositor *compositor,
 		      uint32_t frame, uint32_t msecs);
 
+#ifdef  __cplusplus
+}
+#endif
+
 #endif