diff --git a/src/glx/dri2_priv.h b/src/glx/dri2_priv.h
index 30ab2cdd871..a93551b146d 100644
--- a/src/glx/dri2_priv.h
+++ b/src/glx/dri2_priv.h
@@ -30,6 +30,9 @@
  *   Kristian Høgsberg (krh@redhat.com)
  */
 
+#ifndef DRI2_PRIV_H
+#define DRI2_PRIV_H
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -82,3 +85,5 @@ dri2_interop_export_object(struct glx_context *ctx,
 #ifdef __cplusplus
 }
 #endif
+
+#endif
diff --git a/src/glx/drisw_priv.h b/src/glx/drisw_priv.h
index a670da2d33b..259fc864f6a 100644
--- a/src/glx/drisw_priv.h
+++ b/src/glx/drisw_priv.h
@@ -23,6 +23,9 @@
  * SOFTWARE.
  */
 
+#ifndef DRISW_PRIV_H
+#define DRISW_PRIV_H
+
 #include <X11/extensions/XShm.h>
 
 struct drisw_display
@@ -73,3 +76,5 @@ drisw_query_renderer_integer(struct glx_screen *base, int attribute,
 _X_HIDDEN int
 drisw_query_renderer_string(struct glx_screen *base, int attribute,
                             const char **value);
+
+#endif
diff --git a/src/glx/glx_error.h b/src/glx/glx_error.h
index 5d3992672e0..6a2f32aa56e 100644
--- a/src/glx/glx_error.h
+++ b/src/glx/glx_error.h
@@ -26,6 +26,10 @@
  promote the sale, use or other dealings in this Software without
  prior written authorization.
 */
+
+#ifndef GLX_ERROR_H
+#define GLX_ERROR_H
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <X11/Xlib.h>
@@ -45,3 +49,5 @@ _X_HIDDEN void __glXSendErrorForXcb(Display * dpy,
 #ifdef __cplusplus
 }
 #endif
+
+#endif