diff --git a/m4/opengl.m4 b/m4/opengl.m4
index 582ad43d3acc73754e22aa66638d2c83447984d9..e9c6f92a04693cac286f08b6be65dee51e088b76 100644
--- a/m4/opengl.m4
+++ b/m4/opengl.m4
@@ -4,9 +4,10 @@ dnl
 AC_DEFUN([ALBERTA_OPENGL_CHECK],
 [# ALBERTA_OPENGL_CHECK start
 AC_REQUIRE([ALBERTA_X_WINDOW_SYSTEM])
+AS_IF([test -z "${x_includes}" -a "${OSX}" = true],[OGL_DFLTINCDIR=/usr/X11R6/include],[OGL_DFLTINCDIR=${x_includes}])
 ALBERTA_CHECK_PACKAGE([OpenGL],[GL],[glXMakeCurrent],
   [${x_libraries}],[${X_ALL_LIBS}],
-  [GL/gl.h],[${x_includes:+${x_includes}} ${includedir} ${oldincludedir}],[${X_CFLAGS}],
+  [GL/gl.h],[${x_includes:+${x_includes}} ${OGL_DFLTINCDIR} ${includedir} ${oldincludedir}],[${X_CFLAGS}],
   [optional])
 # ALBERTA_OPENGL_CHECK stop
 ])