--- a/src/drivers/video_glx.h	Tue Jan 01 05:08:38 2008 +0000
+++ b/src/drivers/video_glx.h	Sun Mar 04 21:10:12 2012 +1000
@@ -16,12 +16,16 @@
  * GNU General Public License for more details.
  */
 
-#ifndef video_glx_driver_H
-#define video_glx_driver_H
+#ifndef lxdream_video_glx_H
+#define lxdream_video_glx_H 1
 
 #include "X11/Xlib.h"
 #include "display.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Initialize GLX support. Detect capabilities, visuals, etc. 
  * Must be called before any other GLX functions
@@ -52,4 +56,8 @@
  */
 void video_glx_shutdown();
 
+#ifdef __cplusplus
+}
 #endif
+
+#endif